Merge remote-tracking branch 'origin/stg-2.409' into ticket37

[stg.git] / include / stg / users.h

diff --git a/include/stg/users.h b/include/stg/users.h
index 2ba238332297b5b70d0267dc4e967d5aacec9428..3fb951e07cbe570a1f3b99cebbb803917542f4c4 100644 (file)
--- a/include/stg/users.h
+++ b/include/stg/users.h
@@ -32,6 +32,8 @@ class USERS {
 public:
     virtual ~USERS() {}
     virtual int  FindByName(const std::string & login, USER_PTR * user) = 0;
 public:
     virtual ~USERS() {}
     virtual int  FindByName(const std::string & login, USER_PTR * user) = 0;

+    virtual int  FindByName(const std::string & login, CONST_USER_PTR * user) const = 0;
+    virtual bool Exists(const std::string & login) const = 0;

 
     virtual bool TariffInUse(const std::string & tariffName) const = 0;
 
 
     virtual bool TariffInUse(const std::string & tariffName) const = 0;
 


@@ -46,13 +48,16 @@ public:
 
     virtual bool Authorize(const std::string & login, uint32_t ip,
                            uint32_t enabledDirs, const AUTH * auth) = 0;
 
     virtual bool Authorize(const std::string & login, uint32_t ip,
                            uint32_t enabledDirs, const AUTH * auth) = 0;

-    virtual bool Unauthorize(const std::string & login, const AUTH * auth) = 0;
+    virtual bool Unauthorize(const std::string & login,
+                             const AUTH * auth,
+                             const std::string & reason = std::string()) = 0;

 
     virtual int  ReadUsers() = 0;
     virtual size_t Count() const = 0;
 
     virtual int  FindByIPIdx(uint32_t ip, USER_PTR * user) const = 0;
     virtual bool IsIPInIndex(uint32_t ip) const = 0;
 
     virtual int  ReadUsers() = 0;
     virtual size_t Count() const = 0;
 
     virtual int  FindByIPIdx(uint32_t ip, USER_PTR * user) const = 0;
     virtual bool IsIPInIndex(uint32_t ip) const = 0;

+    virtual bool IsIPInUse(uint32_t ip, const std::string & login, CONST_USER_PTR * user) const = 0;

 
     virtual int  OpenSearch() = 0;
     virtual int  SearchNext(int handle, USER_PTR * u) = 0;
 
     virtual int  OpenSearch() = 0;
     virtual int  SearchNext(int handle, USER_PTR * u) = 0;