diff options
| author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-10-21 23:46:05 +0000 |
|---|---|---|
| committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-10-21 23:46:05 +0000 |
| commit | 984cc96a1f832abf9b5fcfddcd8260c5b12bd2a9 (patch) | |
| tree | 4c14d438e08c9b77119ba365971bb04c46a10bbb /include | |
| parent | 4219a6e4145c839f166fddf8a2d5889b32ca0346 (diff) | |
Move AllowedPrivs and similar oper information from LocalUser to OperInfo
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11947 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'include')
| -rw-r--r-- | include/configreader.h | 10 | ||||
| -rw-r--r-- | include/users.h | 12 |
2 files changed, 10 insertions, 12 deletions
diff --git a/include/configreader.h b/include/configreader.h index d4bc4b71b..6afea4504 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -113,6 +113,15 @@ class ServerLimits class CoreExport OperInfo : public refcountbase { public: + std::set<std::string> AllowedOperCommands; + std::set<std::string> AllowedPrivs; + + /** Allowed user modes from oper classes. */ + std::bitset<64> AllowedUserModes; + + /** Allowed channel modes from oper classes. */ + std::bitset<64> AllowedChanModes; + /** <oper> block used for this oper-up. May be NULL. */ reference<ConfigTag> oper_block; /** <type> block used for this oper-up. Valid for local users, may be NULL on remote */ @@ -124,6 +133,7 @@ class CoreExport OperInfo : public refcountbase /** Get a configuration item, searching in the oper, type, and class blocks (in that order) */ std::string getConfig(const std::string& key); + void init(); inline const char* NameStr() { diff --git a/include/users.h b/include/users.h index bb8fba007..241eed0c6 100644 --- a/include/users.h +++ b/include/users.h @@ -754,15 +754,6 @@ class CoreExport LocalUser : public User */ InvitedList invites; - std::set<std::string> *AllowedOperCommands; - std::set<std::string> *AllowedPrivs; - - /** Allowed user modes from oper classes. */ - std::bitset<64> AllowedUserModes; - - /** Allowed channel modes from oper classes. */ - std::bitset<64> AllowedChanModes; - public: LocalUser(); CullResult cull(); @@ -900,9 +891,6 @@ class CoreExport LocalUser : public User * @return True if the user can set or unset this mode. */ bool HasModePermission(unsigned char mode, ModeType type); - - void OperInternal(); - void UnOperInternal(); }; class CoreExport RemoteUser : public User |