Removed some unused stuff from netunit.cpp.

[stg.git] / projects / stargazer / users_impl.h

diff --git a/projects/stargazer/users_impl.h b/projects/stargazer/users_impl.h
index 0c2af78d5f84fea5bbab66e25e0deed6787964e2..0cba7893bc04ca0db3630f890697673117753ed0 100644 (file)
--- a/projects/stargazer/users_impl.h
+++ b/projects/stargazer/users_impl.h
@@ -71,10 +71,15 @@ class USERS_IMPL : private NONCOPYABLE, public USERS {
     friend class PROPERTY_NOTIFER_IP_AFTER;
 
 public:
     friend class PROPERTY_NOTIFER_IP_AFTER;
 
 public:

-    USERS_IMPL(SETTINGS_IMPL * s, STORE * store, TARIFFS * tariffs, const ADMIN * sysAdmin);
+    USERS_IMPL(SETTINGS_IMPL * s, STORE * store,
+               TARIFFS * tariffs, SERVICES & svcs,
+               const ADMIN * sysAdmin);

     virtual ~USERS_IMPL();
 
     int             FindByName(const std::string & login, USER_PTR * user);
     virtual ~USERS_IMPL();
 
     int             FindByName(const std::string & login, USER_PTR * user);

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

 
     bool            TariffInUse(const std::string & tariffName) const;
 
 
     bool            TariffInUse(const std::string & tariffName) const;
 


@@ -95,7 +100,9 @@ public:
 
     bool            Authorize(const std::string & login, uint32_t ip,
                               uint32_t enabledDirs, const AUTH * auth);
 
     bool            Authorize(const std::string & login, uint32_t ip,
                               uint32_t enabledDirs, const AUTH * auth);

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

 
     int             ReadUsers();
     size_t          Count() const { return users.size(); }
 
     int             ReadUsers();
     size_t          Count() const { return users.size(); }


@@ -122,6 +129,7 @@ private:
     bool            FindByIPIdx(uint32_t ip, user_iter & iter) const;
 
     int             FindByNameNonLock(const std::string & login, user_iter * user);
     bool            FindByIPIdx(uint32_t ip, user_iter & iter) const;
 
     int             FindByNameNonLock(const std::string & login, user_iter * user);

+    int             FindByNameNonLock(const std::string & login, const_user_iter * user) const;

 
     void            RealDelUser();
     void            ProcessActions();
 
     void            RealDelUser();
     void            ProcessActions();


@@ -144,6 +152,7 @@ private:
 
     SETTINGS_IMPL *     settings;
     TARIFFS *           tariffs;
 
     SETTINGS_IMPL *     settings;
     TARIFFS *           tariffs;

+    SERVICES &          m_services;

     STORE *             store;
     const ADMIN *       sysAdmin;
     STG_LOGGER &        WriteServLog;
     STORE *             store;
     const ADMIN *       sysAdmin;
     STG_LOGGER &        WriteServLog;