From 984cc96a1f832abf9b5fcfddcd8260c5b12bd2a9 Mon Sep 17 00:00:00 2001
From: danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Wed, 21 Oct 2009 23:46:05 +0000
Subject: 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
---
 include/configreader.h | 10 ++++++++++
 include/users.h        | 12 ------------
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'include')

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
-- 
cgit v1.2.3