diff -r 000000000000 -r b7aa2b626807 core/AdminCache.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/AdminCache.cpp	Sun Mar 30 07:00:22 2008 +0000
@@ -0,0 +1,1732 @@
+/**
+ * vim: set ts=4 :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * =============================================================================
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3.0, as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * As a special exception, AlliedModders LLC gives you permission to link the
+ * code of this program (as well as its derivative works) to "Half-Life 2," the
+ * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+ * by the Valve Corporation.  You must obey the GNU General Public License in
+ * all respects for all other code used.  Additionally, AlliedModders LLC grants
+ * this exception to all derivative works.  AlliedModders LLC defines further
+ * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+ * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+
+#include <string.h>
+#include <assert.h>
+#include <ITextParsers.h>
+#include "AdminCache.h"
+#include "ShareSys.h"
+#include "ForwardSys.h"
+#include "PlayerManager.h"
+#include "ConCmdManager.h"
+#include "Logger.h"
+#include "sourcemod.h"
+#include "sm_stringutil.h"
+#include "sourcemm_api.h"
+
+#define LEVEL_STATE_NONE		0
+#define LEVEL_STATE_LEVELS		1
+#define LEVEL_STATE_FLAGS		2
+
+AdminCache g_Admins;
+AdminFlag g_FlagLetters[26];
+bool g_FlagSet[26];
+
+ConVar sm_immunity_mode("sm_immunity_mode", "1", FCVAR_SPONLY, "Mode for deciding immunity protection");
+
+/* Default flags */
+AdminFlag g_DefaultFlags[26] = 
+{
+	Admin_Reservation, Admin_Generic, Admin_Kick, Admin_Ban, Admin_Unban,
+	Admin_Slay, Admin_Changemap, Admin_Convars, Admin_Config, Admin_Chat,
+	Admin_Vote, Admin_Password, Admin_RCON, Admin_Cheats, Admin_Custom1, 
+	Admin_Custom2, Admin_Custom3, Admin_Custom4, Admin_Custom5, Admin_Custom6,
+	Admin_Generic, Admin_Generic, Admin_Generic, Admin_Generic, Admin_Generic,
+	Admin_Root
+};
+
+
+class FlagReader : public ITextListener_SMC
+{
+public:
+	void LoadLevels()
+	{
+		if (!Parse())
+		{
+			memcpy(g_FlagLetters, g_DefaultFlags, sizeof(AdminFlag) * 26);
+			for (unsigned int i=0; i<20; i++)
+			{
+				g_FlagSet[i] = true;
+			}
+			g_FlagSet[25] = true;
+		}
+	}
+private:
+	bool Parse()
+	{
+		SMCStates states;
+		SMCError error;
+
+		m_bFileNameLogged = false;
+		g_SourceMod.BuildPath(Path_SM, m_File, sizeof(m_File), "configs/admin_levels.cfg");
+
+		if ((error = textparsers->ParseFile_SMC(m_File, this, &states))
+			!= SMCError_Okay)
+		{
+			const char *err_string = textparsers->GetSMCErrorString(error);
+			if (!err_string)
+			{
+				err_string = "Unknown error";
+			}
+			ParseError(NULL, "Error %d (%s)", error, err_string);
+			return false;
+		}
+
+		return true;
+	}
+	void ReadSMC_ParseStart()
+	{
+		m_LevelState = LEVEL_STATE_NONE;
+		m_IgnoreLevel = 0;
+		memset(g_FlagSet, 0, sizeof(g_FlagSet));
+	}
+	SMCResult ReadSMC_NewSection(const SMCStates *states, const char *name)
+	{
+		if (m_IgnoreLevel)
+		{
+			m_IgnoreLevel++;
+			return SMCResult_Continue;
+		}
+
+		if (m_LevelState == LEVEL_STATE_NONE)
+		{
+			if (strcmp(name, "Levels") == 0)
+			{
+				m_LevelState = LEVEL_STATE_LEVELS;
+			} 
+			else 
+			{
+				m_IgnoreLevel++;
+			}
+		} else if (m_LevelState == LEVEL_STATE_LEVELS) {
+			if (strcmp(name, "Flags") == 0)
+			{
+				m_LevelState = LEVEL_STATE_FLAGS;
+			} 
+			else 
+			{
+				m_IgnoreLevel++;
+			}
+		} 
+		else 
+		{
+			m_IgnoreLevel++;
+		}
+
+		return SMCResult_Continue;
+	}
+	SMCResult ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value)
+	{
+		if (m_LevelState != LEVEL_STATE_FLAGS || m_IgnoreLevel)
+		{
+			return SMCResult_Continue;
+		}
+
+		unsigned char c = (unsigned)value[0];
+
+		if (c < (unsigned)'a' || c > (unsigned)'z')
+		{
+			ParseError(states, "Flag \"%c\" is not a lower-case ASCII letter", c);
+			return SMCResult_Continue;
+		}
+
+		c -= (unsigned)'a';
+
+		assert(c >= 0 && c < 26);
+
+		if (!g_Admins.FindFlag(key, &g_FlagLetters[c]))
+		{
+			ParseError(states, "Unrecognized admin level \"%s\"", key);
+			return SMCResult_Continue;
+		}
+
+		g_FlagSet[c] = true;
+
+		return SMCResult_Continue;
+	}
+	SMCResult ReadSMC_LeavingSection(const SMCStates *states)
+	{
+		if (m_IgnoreLevel)
+		{
+			m_IgnoreLevel--;
+			return SMCResult_Continue;
+		}
+
+		if (m_LevelState == LEVEL_STATE_FLAGS)
+		{
+			m_LevelState = LEVEL_STATE_LEVELS;
+			return SMCResult_Halt;
+		} 
+		else if (m_LevelState == LEVEL_STATE_LEVELS) 
+		{
+			m_LevelState = LEVEL_STATE_NONE;
+		}
+
+		return SMCResult_Continue;
+	}
+	void ParseError(const SMCStates *states, const char *message, ...)
+	{
+		va_list ap;
+		char buffer[256];
+
+		va_start(ap, message);
+		UTIL_FormatArgs(buffer, sizeof(buffer), message, ap);
+		va_end(ap);
+
+		if (!m_bFileNameLogged)
+		{
+			g_Logger.LogError("[SM] Parse error(s) detected in file \"%s\":", m_File);
+			m_bFileNameLogged = true;
+		}
+
+		g_Logger.LogError("[SM] (Line %d): %s", states ? states->line : 0, buffer);
+	}
+private:
+	bool m_bFileNameLogged;
+	char m_File[PLATFORM_MAX_PATH];
+	int m_LevelState;
+	int m_IgnoreLevel;
+} s_FlagReader;
+
+AdminCache::AdminCache()
+{
+	m_pCmdOverrides = sm_trie_create();
+	m_pCmdGrpOverrides = sm_trie_create();
+	m_pStrings = new BaseStringTable(1024);
+	m_pMemory = m_pStrings->GetMemTable();
+	m_FreeGroupList = m_FirstGroup = m_LastGroup = INVALID_GROUP_ID;
+	m_FreeUserList = m_FirstUser = m_LastUser = INVALID_ADMIN_ID;
+	m_pGroups = sm_trie_create();
+	m_pCacheFwd = NULL;
+	m_FirstGroup = -1;
+	m_pAuthTables = sm_trie_create();
+	m_InvalidatingAdmins = false;
+	m_destroying = false;
+	m_pLevelNames = sm_trie_create();
+}
+
+AdminCache::~AdminCache()
+{
+	m_destroying = true;
+	DumpAdminCache(AdminCache_Overrides, false);
+	DumpAdminCache(AdminCache_Groups, false);
+
+	sm_trie_destroy(m_pCmdGrpOverrides);
+	sm_trie_destroy(m_pCmdOverrides);
+
+	if (m_pGroups)
+	{
+		sm_trie_destroy(m_pGroups);
+	}
+
+	List<AuthMethod>::iterator iter;
+	for (iter=m_AuthMethods.begin();
+		 iter!=m_AuthMethods.end();
+		 iter++)
+	{
+		sm_trie_destroy((*iter).table);
+	}
+
+	sm_trie_destroy(m_pAuthTables);
+
+	delete m_pStrings;
+
+	sm_trie_destroy(m_pLevelNames);
+}
+
+void AdminCache::OnSourceModStartup(bool late)
+{
+	RegisterAuthIdentType("steam");
+	RegisterAuthIdentType("name");
+	RegisterAuthIdentType("ip");
+
+	NameFlag("reservation", Admin_Reservation);
+	NameFlag("kick", Admin_Kick);
+	NameFlag("generic", Admin_Generic);
+	NameFlag("ban", Admin_Ban);
+	NameFlag("unban", Admin_Unban);
+	NameFlag("slay", Admin_Slay);
+	NameFlag("changemap", Admin_Changemap);
+	NameFlag("cvars", Admin_Convars);
+	NameFlag("config", Admin_Config);
+	NameFlag("chat", Admin_Chat);
+	NameFlag("vote", Admin_Vote);
+	NameFlag("password", Admin_Password);
+	NameFlag("rcon", Admin_RCON);
+	NameFlag("cheats", Admin_Cheats);
+	NameFlag("root", Admin_Root);
+	NameFlag("custom1", Admin_Custom1);
+	NameFlag("custom2", Admin_Custom2);
+	NameFlag("custom3", Admin_Custom3);
+	NameFlag("custom4", Admin_Custom4);
+	NameFlag("custom5", Admin_Custom5);
+	NameFlag("custom6", Admin_Custom6);
+}
+
+void AdminCache::OnSourceModAllInitialized()
+{
+	m_pCacheFwd = g_Forwards.CreateForward("OnRebuildAdminCache", ET_Ignore, 1, NULL, Param_Cell);
+	g_ShareSys.AddInterface(NULL, this);
+}
+
+void AdminCache::OnSourceModLevelChange(const char *mapName)
+{
+	/* For now, we only read these once per level. */
+	s_FlagReader.LoadLevels();
+}
+
+void AdminCache::OnSourceModShutdown()
+{
+	g_Forwards.ReleaseForward(m_pCacheFwd);
+	m_pCacheFwd = NULL;
+}
+
+void AdminCache::OnSourceModPluginsLoaded()
+{
+	DumpAdminCache(AdminCache_Overrides, true);
+	DumpAdminCache(AdminCache_Groups, true);
+}
+
+void AdminCache::NameFlag(const char *str, AdminFlag flag)
+{
+	sm_trie_insert(m_pLevelNames, str, (void *)flag);
+}
+
+bool AdminCache::FindFlag(const char *str, AdminFlag *pFlag)
+{
+	void *obj;
+	if (!sm_trie_retrieve(m_pLevelNames, str, &obj))
+	{
+		return false;
+	}
+
+	if (pFlag)
+	{
+		*pFlag = (AdminFlag)(int)obj;
+	}
+
+	return true;
+}
+
+void AdminCache::AddCommandOverride(const char *cmd, OverrideType type, FlagBits flags)
+{
+	Trie *pTrie = NULL;
+	if (type == Override_Command)
+	{
+		pTrie = m_pCmdOverrides;
+	} else if (type == Override_CommandGroup) {
+		pTrie = m_pCmdGrpOverrides;
+	} else {
+		return;
+	}
+
+	sm_trie_insert(pTrie, cmd, (void *)(unsigned int)flags);
+
+	g_ConCmds.UpdateAdminCmdFlags(cmd, type, flags, false);
+}
+
+bool AdminCache::GetCommandOverride(const char *cmd, OverrideType type, FlagBits *pFlags)
+{
+	Trie *pTrie = NULL;
+
+	if (type == Override_Command)
+	{
+		pTrie = m_pCmdOverrides;
+	} else if (type == Override_CommandGroup) {
+		pTrie = m_pCmdGrpOverrides;
+	} else {
+		return false;
+	}
+
+	void *object;
+	if (sm_trie_retrieve(pTrie, cmd, &object))
+	{
+		if (pFlags)
+		{
+			*pFlags = (FlagBits)object;
+		}
+		return true;
+	}
+
+	return false;
+}
+
+void AdminCache::UnsetCommandOverride(const char *cmd, OverrideType type)
+{
+	if (type == Override_Command)
+	{
+		return _UnsetCommandOverride(cmd);
+	} else if (type == Override_CommandGroup) {
+		return _UnsetCommandGroupOverride(cmd);
+	}
+}
+
+void AdminCache::_UnsetCommandGroupOverride(const char *group)
+{
+	if (!m_pCmdGrpOverrides)
+	{
+		return;
+	}
+
+	sm_trie_delete(m_pCmdGrpOverrides, group);
+
+	g_ConCmds.UpdateAdminCmdFlags(group, Override_CommandGroup, 0, true);
+}
+
+void AdminCache::_UnsetCommandOverride(const char *cmd)
+{
+	if (!m_pCmdOverrides)
+	{
+		return;
+	}
+
+	sm_trie_delete(m_pCmdOverrides, cmd);
+
+	g_ConCmds.UpdateAdminCmdFlags(cmd, Override_Command, 0, true);
+}
+
+void AdminCache::DumpCommandOverrideCache(OverrideType type)
+{
+	if (type == Override_Command && m_pCmdOverrides)
+	{
+		sm_trie_clear(m_pCmdOverrides);
+	} else if (type == Override_CommandGroup && m_pCmdGrpOverrides) {
+		sm_trie_clear(m_pCmdGrpOverrides);
+	}
+}
+
+AdminId AdminCache::CreateAdmin(const char *name)
+{
+	AdminId id;
+	AdminUser *pUser;
+
+	if (m_FreeUserList != INVALID_ADMIN_ID)
+	{
+		pUser = (AdminUser *)m_pMemory->GetAddress(m_FreeUserList);
+		assert(pUser->magic == USR_MAGIC_UNSET);
+		id = m_FreeUserList;
+		m_FreeUserList = pUser->next_user;
+	} else {
+		id = m_pMemory->CreateMem(sizeof(AdminUser), (void **)&pUser);
+		pUser->grp_size = 0;
+		pUser->grp_table = -1;
+	}
+
+	pUser->flags = 0;
+	pUser->eflags = 0;
+	pUser->grp_count = 0;
+	pUser->password = -1;
+	pUser->magic = USR_MAGIC_SET;
+	pUser->auth.identidx = -1;
+	pUser->auth.index = 0;
+	pUser->immunity_level = 0;
+	pUser->serialchange = 1;
+
+	if (m_FirstUser == INVALID_ADMIN_ID)
+	{
+		m_FirstUser = id;
+		m_LastUser = id;
+	} else {
+		AdminUser *pPrev = (AdminUser *)m_pMemory->GetAddress(m_LastUser);
+		pPrev->next_user = id;
+		pUser->prev_user = m_LastUser;
+		m_LastUser = id;
+	}
+
+	if (name && name[0] != '\0')
+	{
+		int nameidx = m_pStrings->AddString(name);
+		pUser = (AdminUser *)m_pMemory->GetAddress(id);
+		pUser->nameidx = nameidx;
+	}
+
+	return id;
+}
+
+GroupId AdminCache::AddGroup(const char *group_name)
+{
+	if (sm_trie_retrieve(m_pGroups, group_name, NULL))
+	{
+		return INVALID_GROUP_ID;
+	}
+
+	GroupId id;
+	AdminGroup *pGroup;
+	if (m_FreeGroupList != INVALID_GROUP_ID)
+	{
+		pGroup = (AdminGroup *)m_pMemory->GetAddress(m_FreeGroupList);
+		assert(pGroup->magic == GRP_MAGIC_UNSET);
+		id = m_FreeGroupList;
+		m_FreeGroupList = pGroup->next_grp;
+	} else {
+		id = m_pMemory->CreateMem(sizeof(AdminGroup), (void **)&pGroup);
+	}
+
+	pGroup->immunity_level = 0;
+	pGroup->immune_table = -1;
+	pGroup->magic = GRP_MAGIC_SET;
+	pGroup->next_grp = INVALID_GROUP_ID;
+	pGroup->pCmdGrpTable = NULL;
+	pGroup->pCmdTable = NULL;
+	pGroup->addflags = 0;
+
+	if (m_FirstGroup == INVALID_GROUP_ID)
+	{
+		m_FirstGroup = id;
+		m_LastGroup = id;
+		pGroup->prev_grp = INVALID_GROUP_ID;
+	} else {
+		AdminGroup *pPrev = (AdminGroup *)m_pMemory->GetAddress(m_LastGroup);
+		assert(pPrev->magic == GRP_MAGIC_SET);
+		pPrev->next_grp = id;
+		pGroup->prev_grp = m_LastGroup;
+		m_LastGroup = id;
+	}
+
+	int nameidx = m_pStrings->AddString(group_name);
+	pGroup = (AdminGroup *)m_pMemory->GetAddress(id);
+	pGroup->nameidx = nameidx;
+
+	sm_trie_insert(m_pGroups, group_name, (void *)id);
+
+	return id;
+}
+
+GroupId AdminCache::FindGroupByName(const char *group_name)
+{
+	void *object;
+
+	if (!sm_trie_retrieve(m_pGroups, group_name, &object))
+	{
+		return INVALID_GROUP_ID;
+	}
+
+	GroupId id = (GroupId)object;
+	AdminGroup *pGroup = (AdminGroup *)m_pMemory->GetAddress(id);
+
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return INVALID_GROUP_ID;
+	}
+
+	return id;
+}
+
+void AdminCache::SetGroupAddFlag(GroupId id, AdminFlag flag, bool enabled)
+{
+	AdminGroup *pGroup = (AdminGroup *)m_pMemory->GetAddress(id);
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return;
+	}
+
+	if (flag < Admin_Reservation || flag >= AdminFlags_TOTAL)
+	{
+		return;
+	}
+
+	FlagBits bits = (1<<(FlagBits)flag);
+
+	if (enabled)
+	{
+		pGroup->addflags |= bits;
+	} else {
+		pGroup->addflags &= ~bits;
+	}
+}
+
+bool AdminCache::GetGroupAddFlag(GroupId id, AdminFlag flag)
+{
+	AdminGroup *pGroup = (AdminGroup *)m_pMemory->GetAddress(id);
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return false;
+	}
+
+	if (flag < Admin_Reservation || flag >= AdminFlags_TOTAL)
+	{
+		return false;
+	}
+
+	FlagBits bit = 1<<(FlagBits)flag;
+	return ((pGroup->addflags & bit) == bit);
+}
+
+FlagBits AdminCache::GetGroupAddFlags(GroupId id)
+{
+	AdminGroup *pGroup = (AdminGroup *)m_pMemory->GetAddress(id);
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return 0;
+	}
+
+	return pGroup->addflags;
+}
+
+const char *AdminCache::GetGroupName(GroupId gid)
+{
+	AdminGroup *pGroup = (AdminGroup *)m_pMemory->GetAddress(gid);
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return NULL;
+	}
+
+	return m_pStrings->GetString(pGroup->nameidx);
+}
+
+void AdminCache::SetGroupGenericImmunity(GroupId id, ImmunityType type, bool enabled)
+{
+	AdminGroup *pGroup = (AdminGroup *)m_pMemory->GetAddress(id);
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return;
+	}
+
+	unsigned int level = 0;
+
+	if (enabled)
+	{
+		if (type == Immunity_Default)
+		{
+			level = 1;
+		} else if (type == Immunity_Global) {
+			level = 2;
+		}
+		if (level > pGroup->immunity_level)
+		{
+			pGroup->immunity_level = level;
+		}
+	} else {
+		pGroup->immunity_level = 0;
+	}
+}
+
+bool AdminCache::GetGroupGenericImmunity(GroupId id, ImmunityType type)
+{
+	AdminGroup *pGroup = (AdminGroup *)m_pMemory->GetAddress(id);
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return false;
+	}
+
+	if (type == Immunity_Default && pGroup->immunity_level >= 1)
+	{
+		return true;
+	} else if (type == Immunity_Global && pGroup->immunity_level >= 2) {
+		return true;
+	}
+
+	return false;
+}
+
+void AdminCache::AddGroupImmunity(GroupId id, GroupId other_id)
+{
+	AdminGroup *pGroup = (AdminGroup *)m_pMemory->GetAddress(other_id);
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return;
+	}
+
+	pGroup = (AdminGroup *)m_pMemory->GetAddress(id);
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return;
+	}
+
+	/* We always need to resize the immunity table */
+	int *table, tblidx;
+	if (pGroup->immune_table == -1)
+	{
+		tblidx = m_pMemory->CreateMem(sizeof(int) * 2, (void **)&table);
+		pGroup = (AdminGroup *)m_pMemory->GetAddress(id);
+		table[0] = 0;
+	} else {
+		int *old_table = (int *)m_pMemory->GetAddress(pGroup->immune_table);
+		/* Break out if this group is already in the list */
+		for (int i=0; i<old_table[0]; i++)
+		{
+			if (old_table[1+i] == other_id)
+			{
+				return;
+			}
+		}
+		tblidx = m_pMemory->CreateMem(sizeof(int) * (old_table[0] + 2), (void **)&table);
+		/* Get the old address again in case of resize */
+		pGroup = (AdminGroup *)m_pMemory->GetAddress(id);
+		old_table = (int *)m_pMemory->GetAddress(pGroup->immune_table);
+		table[0] = old_table[0];
+		for (unsigned int i=1; i<=(unsigned int)old_table[0]; i++)
+		{
+			table[i] = old_table[i];
+		}
+	}
+
+	/* Assign */
+	pGroup->immune_table = tblidx;
+
+	/* Add to the array */
+	table[0]++;
+	table[table[0]] = other_id;
+}
+
+unsigned int AdminCache::GetGroupImmunityCount(GroupId id)
+{
+	AdminGroup *pGroup = (AdminGroup *)m_pMemory->GetAddress(id);
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return 0;
+	}
+
+	if (pGroup->immune_table == -1)
+	{
+		return 0;
+	}
+
+	int *table = (int *)m_pMemory->GetAddress(pGroup->immune_table);
+
+	return table[0];
+}
+
+GroupId AdminCache::GetGroupImmunity(GroupId id, unsigned int number)
+{
+	AdminGroup *pGroup = (AdminGroup *)m_pMemory->GetAddress(id);
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return INVALID_GROUP_ID;
+	}
+
+	if (pGroup->immune_table == -1)
+	{
+		return INVALID_GROUP_ID;
+	}
+
+	int *table = (int *)m_pMemory->GetAddress(pGroup->immune_table);
+	if (number >= (unsigned int)table[0])
+	{
+		return INVALID_GROUP_ID;
+	}
+
+	return table[1 + number];
+}
+
+void AdminCache::AddGroupCommandOverride(GroupId id, const char *name, OverrideType type, OverrideRule rule)
+{
+	AdminGroup *pGroup = (AdminGroup *)m_pMemory->GetAddress(id);
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return;
+	}
+
+	Trie *pTrie = NULL;
+	if (type == Override_Command)
+	{
+		if (pGroup->pCmdTable == NULL)
+		{
+			pGroup->pCmdTable = sm_trie_create();
+		}
+		pTrie = pGroup->pCmdTable;
+	} else if (type == Override_CommandGroup) {
+		if (pGroup->pCmdGrpTable == NULL)
+		{
+			pGroup->pCmdGrpTable = sm_trie_create();
+		}
+		pTrie = pGroup->pCmdGrpTable;
+	} else {
+		return;
+	}
+
+	sm_trie_insert(pTrie, name, (void *)(int)rule);
+}
+
+bool AdminCache::GetGroupCommandOverride(GroupId id, const char *name, OverrideType type, OverrideRule *pRule)
+{
+	AdminGroup *pGroup = (AdminGroup *)m_pMemory->GetAddress(id);
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return false;
+	}
+
+	Trie *pTrie = NULL;
+	if (type == Override_Command)
+	{
+		if (pGroup->pCmdTable == NULL)
+		{
+			return false;
+		}
+		pTrie = pGroup->pCmdTable;
+	} else if (type == Override_CommandGroup) {
+		if (pGroup->pCmdGrpTable == NULL)
+		{
+			return false;
+		}
+		pTrie = pGroup->pCmdGrpTable;
+	} else {
+		return false;
+	}
+
+	void *object;
+	if (!sm_trie_retrieve(pTrie, name, &object))
+	{
+		return false;
+	}
+
+	if (pRule)
+	{
+		*pRule = (OverrideRule)(int)object;
+	}
+	
+	return true;
+}
+
+Trie *AdminCache::GetMethodByIndex(unsigned int index)
+{
+	List<AuthMethod>::iterator iter;
+	for (iter=m_AuthMethods.begin();
+		 iter!=m_AuthMethods.end();
+		 iter++)
+	{
+		if (index-- == 0)
+		{
+			return (*iter).table;
+		}
+	}
+
+	return NULL;
+}
+
+bool AdminCache::InvalidateAdmin(AdminId id)
+{
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	AdminUser *pOther;
+	if (!pUser || pUser->magic != USR_MAGIC_SET)
+	{
+		return false;
+	}
+
+	if (!m_InvalidatingAdmins && !m_destroying)
+	{
+		g_Players.ClearAdminId(id);
+	}
+
+	/* Unlink from the dbl link list */
+	if (id == m_FirstUser && id == m_LastUser)
+	{
+		m_FirstUser = INVALID_ADMIN_ID;
+		m_LastUser = INVALID_ADMIN_ID;
+	} else if (id == m_FirstUser) {
+		m_FirstUser = pUser->next_user;
+		pOther = (AdminUser *)m_pMemory->GetAddress(m_FirstUser);
+		pOther->prev_user = INVALID_ADMIN_ID;
+	} else if (id == m_LastUser) {
+		m_LastUser = pUser->prev_user;
+		pOther = (AdminUser *)m_pMemory->GetAddress(m_LastUser);
+		pOther->next_user = INVALID_ADMIN_ID;
+	} else {
+		pOther = (AdminUser *)m_pMemory->GetAddress(pUser->prev_user);
+		pOther->next_user = pUser->next_user;
+		pOther = (AdminUser *)m_pMemory->GetAddress(pUser->next_user);
+		pOther->prev_user = pUser->prev_user;
+	}
+
+	/* Unlink from auth tables */
+	if (pUser->auth.identidx != -1)
+	{
+		Trie *pTrie = GetMethodByIndex(pUser->auth.index);
+		if (pTrie)
+		{
+			sm_trie_delete(pTrie, m_pStrings->GetString(pUser->auth.identidx));
+		}
+	}
+
+	/* Clear table counts */
+	pUser->grp_count = 0;
+	
+	/* Link into free list */
+	pUser->magic = USR_MAGIC_UNSET;
+	pUser->next_user = m_FreeUserList;
+	m_FreeUserList = id;
+
+	/* Unset serial change */
+	pUser->serialchange = 0;
+
+	return true;
+}
+
+
+void AdminCache::InvalidateGroup(GroupId id)
+{
+	AdminGroup *pGroup = (AdminGroup *)m_pMemory->GetAddress(id);
+	AdminGroup *pOther;
+
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return;
+	}
+
+	const char *str = m_pStrings->GetString(pGroup->nameidx);
+	sm_trie_delete(m_pGroups, str);
+
+	/* Unlink from the live dbllink list */
+	if (id == m_FirstGroup && id == m_LastGroup)
+	{
+		m_LastGroup = INVALID_GROUP_ID;
+		m_FirstGroup = INVALID_GROUP_ID;
+	} else if (id == m_FirstGroup) {
+		m_FirstGroup = pGroup->next_grp;
+		pOther = (AdminGroup *)m_pMemory->GetAddress(m_FirstGroup);
+		pOther->prev_grp = INVALID_GROUP_ID;
+	} else if (id == m_LastGroup) {
+		m_LastGroup = pGroup->prev_grp;
+		pOther = (AdminGroup *)m_pMemory->GetAddress(m_LastGroup);
+		pOther->next_grp = INVALID_GROUP_ID;
+	} else {
+		pOther = (AdminGroup *)m_pMemory->GetAddress(pGroup->prev_grp);
+		pOther->next_grp = pGroup->next_grp;
+		pOther = (AdminGroup *)m_pMemory->GetAddress(pGroup->next_grp);
+		pOther->prev_grp = pGroup->prev_grp;
+	}
+
+	/* Free any used memory to be safe */
+	if (pGroup->pCmdGrpTable)
+	{
+		sm_trie_destroy(pGroup->pCmdGrpTable);
+		pGroup->pCmdGrpTable = NULL;
+	}
+	if (pGroup->pCmdTable)
+	{
+		sm_trie_destroy(pGroup->pCmdTable);
+		pGroup->pCmdTable = NULL;
+	}
+
+	/* Link into the free list */
+	pGroup->magic = GRP_MAGIC_UNSET;
+	pGroup->next_grp = m_FreeGroupList;
+	m_FreeGroupList = id;
+
+	int idx = m_FirstUser;
+	AdminUser *pUser;
+	int *table;
+	while (idx != INVALID_ADMIN_ID)
+	{
+		pUser = (AdminUser *)m_pMemory->GetAddress(idx);
+		if (pUser->grp_count > 0)
+		{
+			table = (int *)m_pMemory->GetAddress(pUser->grp_table);
+			for (unsigned int i=0; i<pUser->grp_count; i++)
+			{
+				if (table[i] == id)
+				{
+					/* We have to remove this entry */
+					for (unsigned int j=i+1; j<pUser->grp_count; j++)
+					{
+						/* Move everything down by one */
+						table[j-1] = table[j];
+					}
+					/* Decrease count */
+					pUser->grp_count--;
+					/* Recalculate effective flags */
+					pUser->eflags = pUser->flags;
+					for (unsigned int j=0; j<pUser->grp_count; j++)
+					{
+						pOther = (AdminGroup *)m_pMemory->GetAddress(table[j]);
+						pUser->eflags |= pOther->addflags;
+					}
+					/* Mark as changed */
+					pUser->serialchange++;
+					/* Break now, duplicates aren't allowed */
+					break;
+				}
+			}
+		}
+		idx = pUser->next_user;
+	}
+}
+
+void AdminCache::InvalidateGroupCache()
+{
+	/* Nuke the free list */
+	m_FreeGroupList = -1;
+
+	/* Nuke reverse lookups */
+	sm_trie_clear(m_pGroups);
+
+	/* Free memory on groups */
+	GroupId cur = m_FirstGroup;
+	AdminGroup *pGroup;
+	while (cur != INVALID_GROUP_ID)
+	{
+		pGroup = (AdminGroup *)m_pMemory->GetAddress(cur);
+		assert(pGroup->magic == GRP_MAGIC_SET);
+		if (pGroup->pCmdGrpTable)
+		{
+			sm_trie_destroy(pGroup->pCmdGrpTable);
+		}
+		if (pGroup->pCmdTable)
+		{
+			sm_trie_destroy(pGroup->pCmdTable);
+		}
+		cur = pGroup->next_grp;
+	}
+
+	m_FirstGroup = INVALID_GROUP_ID;
+	m_LastGroup = INVALID_GROUP_ID;
+
+	InvalidateAdminCache(false);
+
+	/* Reset the memory table */
+	m_pMemory->Reset();
+}
+
+void AdminCache::AddAdminListener(IAdminListener *pListener)
+{
+	m_hooks.push_back(pListener);
+}
+
+void AdminCache::RemoveAdminListener(IAdminListener *pListener)
+{
+	m_hooks.remove(pListener);
+}
+
+void AdminCache::RegisterAuthIdentType(const char *name)
+{
+	if (sm_trie_retrieve(m_pAuthTables, name, NULL))
+	{
+		return;
+	}
+
+	Trie *pAuth = sm_trie_create();
+
+	AuthMethod method;
+	method.name.assign(name);
+	method.table = pAuth;
+
+	m_AuthMethods.push_back(method);
+
+	sm_trie_insert(m_pAuthTables, name, pAuth);
+}
+
+void AdminCache::InvalidateAdminCache(bool unlink_admins)
+{
+	m_InvalidatingAdmins = true;
+	if (!m_destroying)
+	{
+		g_Players.ClearAllAdmins();
+	}
+	/* Wipe the identity cache first */
+	List<AuthMethod>::iterator iter;
+	for (iter=m_AuthMethods.begin();
+		 iter!=m_AuthMethods.end();
+		 iter++)
+	{
+		sm_trie_clear((*iter).table);
+	}
+	
+	if (unlink_admins)
+	{
+		while (m_FirstUser != INVALID_ADMIN_ID)
+		{
+			InvalidateAdmin(m_FirstUser);
+		}
+	} else {
+		m_FirstUser = -1;
+		m_LastUser = -1;
+		m_FreeUserList = -1;
+	}
+	m_InvalidatingAdmins = false;
+}
+
+void AdminCache::DumpAdminCache(AdminCachePart part, bool rebuild)
+{
+	List<IAdminListener *>::iterator iter;
+	IAdminListener *pListener;
+	cell_t result;
+
+	if (part == AdminCache_Overrides)
+	{
+		DumpCommandOverrideCache(Override_Command);
+		DumpCommandOverrideCache(Override_CommandGroup);
+		if (rebuild && !m_destroying)
+		{
+			for (iter=m_hooks.begin(); iter!=m_hooks.end(); iter++)
+			{
+				pListener = (*iter);
+				pListener->OnRebuildOverrideCache();
+			}
+			m_pCacheFwd->PushCell(part);
+			m_pCacheFwd->Execute(&result);
+		}
+	} else if (part == AdminCache_Groups || part == AdminCache_Admins) {
+		if (part == AdminCache_Groups)
+		{
+			InvalidateGroupCache();
+			if (rebuild && !m_destroying)
+			{
+				for (iter=m_hooks.begin(); iter!=m_hooks.end(); iter++)
+				{
+					pListener = (*iter);
+					pListener->OnRebuildGroupCache();
+				}
+				m_pCacheFwd->PushCell(part);
+				m_pCacheFwd->Execute(&result);
+			}
+		}
+		InvalidateAdminCache(true);
+		if (rebuild && !m_destroying)
+		{
+			for (iter=m_hooks.begin(); iter!=m_hooks.end(); iter++)
+			{
+				pListener = (*iter);
+				pListener->OnRebuildAdminCache((part == AdminCache_Groups));
+			}
+			m_pCacheFwd->PushCell(AdminCache_Admins);
+			m_pCacheFwd->Execute(&result);
+			g_Players.RecheckAnyAdmins();
+		}
+	}
+}
+
+const char *AdminCache::GetAdminName(AdminId id)
+{
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	if (!pUser || pUser->magic != USR_MAGIC_SET)
+	{
+		return NULL;
+	}
+
+	return m_pStrings->GetString(pUser->nameidx);
+}
+
+bool AdminCache::GetMethodIndex(const char *name, unsigned int *_index)
+{
+	List<AuthMethod>::iterator iter;
+	unsigned int index = 0;
+	for (iter=m_AuthMethods.begin();
+		 iter!=m_AuthMethods.end();
+		 iter++,index++)
+	{
+		if ((*iter).name.compare(name) == 0)
+		{
+			*_index = index;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool AdminCache::BindAdminIdentity(AdminId id, const char *auth, const char *ident)
+{
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	if (!pUser || pUser->magic != USR_MAGIC_SET)
+	{
+		return false;
+	}
+
+	Trie *pTable;
+	if (!sm_trie_retrieve(m_pAuthTables, auth, (void **)&pTable))
+	{
+		return false;
+	}
+
+	if (sm_trie_retrieve(pTable, ident, NULL))
+	{
+		return false;
+	}
+
+	int i_ident = m_pStrings->AddString(ident);
+
+	pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	pUser->auth.identidx = i_ident;
+	GetMethodIndex(auth, &pUser->auth.index);
+
+	return sm_trie_insert(pTable, ident, (void **)id);
+}
+
+AdminId AdminCache::FindAdminByIdentity(const char *auth, const char *identity)
+{
+	Trie *pTable;
+	if (!sm_trie_retrieve(m_pAuthTables, auth, (void **)&pTable))
+	{
+		return INVALID_ADMIN_ID;
+	}
+
+	void *object;
+	if (!sm_trie_retrieve(pTable, identity, &object))
+	{
+		return INVALID_ADMIN_ID;
+	}
+
+	return (AdminId)object;
+}
+
+void AdminCache::SetAdminFlag(AdminId id, AdminFlag flag, bool enabled)
+{
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	if (!pUser || pUser->magic != USR_MAGIC_SET)
+	{
+		return;
+	}
+
+	if (flag < Admin_Reservation
+		|| flag >= AdminFlags_TOTAL)
+	{
+		return;
+	}
+	
+	FlagBits bits = (1<<(FlagBits)flag);
+
+	if (enabled)
+	{
+		pUser->flags |= bits;
+		pUser->eflags |= bits;
+	} else {
+		pUser->flags &= ~bits;
+		pUser->eflags &= ~bits;
+	}
+
+	pUser->serialchange++;
+}
+
+bool AdminCache::GetAdminFlag(AdminId id, AdminFlag flag, AccessMode mode)
+{
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	if (!pUser || pUser->magic != USR_MAGIC_SET)
+	{
+		return false;
+	}
+
+	if (flag < Admin_Reservation
+		|| flag >= AdminFlags_TOTAL)
+	{
+		return false;
+	}
+
+	FlagBits bit = (1<<(FlagBits)flag);
+
+	if (mode == Access_Real)
+	{
+		return ((pUser->flags & bit) == bit);
+	} else if (mode == Access_Effective) {
+		bool has_bit = ((pUser->eflags & bit) == bit);
+		if (!has_bit && flag != Admin_Root && ((pUser->eflags & ADMFLAG_ROOT) == ADMFLAG_ROOT))
+		{
+			has_bit = true;
+		}
+		return has_bit;
+	}
+
+	return false;
+}
+
+FlagBits AdminCache::GetAdminFlags(AdminId id, AccessMode mode)
+{
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	if (!pUser || pUser->magic != USR_MAGIC_SET)
+	{
+		return 0;
+	}
+
+	if (mode == Access_Real)
+	{
+		return pUser->flags;
+	} else if (mode == Access_Effective) {
+		return pUser->eflags;
+	}
+
+	return 0;
+}
+
+void AdminCache::SetAdminFlags(AdminId id, AccessMode mode, FlagBits bits)
+{
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	if (!pUser || pUser->magic != USR_MAGIC_SET)
+	{
+		return;
+	}
+
+	if (mode == Access_Real)
+	{
+		pUser->flags = bits;
+		pUser->eflags = bits;
+	} else if (mode == Access_Effective) {
+		pUser->eflags = bits;
+	}
+
+	pUser->serialchange++;
+}
+
+bool AdminCache::AdminInheritGroup(AdminId id, GroupId gid)
+{
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	if (!pUser || pUser->magic != USR_MAGIC_SET)
+	{
+		return false;
+	}
+
+	AdminGroup *pGroup = (AdminGroup *)m_pMemory->GetAddress(gid);
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return false;
+	}
+
+	/* First check for duplicates */
+	if (pUser->grp_count != 0)
+	{
+		int *temp_table = (int *)m_pMemory->GetAddress(pUser->grp_table);
+		for (unsigned int i=0; i<pUser->grp_count; i++)
+		{
+			if (temp_table[i] == gid)
+			{
+				return false;
+			}
+		}
+	}
+
+	int *table;
+	if (pUser->grp_count + 1 > pUser->grp_size)
+	{
+		int new_size = 0;
+		int tblidx;
+		
+		if (pUser->grp_size == 0)
+		{
+			new_size = 2;
+		} else {
+			new_size = pUser->grp_size * 2;
+		}
+		
+		/* Create and refresh pointers */
+		tblidx = m_pMemory->CreateMem(new_size * sizeof(int), (void **)&table);
+		pUser = (AdminUser *)m_pMemory->GetAddress(id);
+		pGroup = (AdminGroup *)m_pMemory->GetAddress(gid);
+
+		/* Copy old data if necessary */
+		if (pUser->grp_table != -1)
+		{
+			int *old_table = (int *)m_pMemory->GetAddress(pUser->grp_table);
+			memcpy(table, old_table, sizeof(int) * pUser->grp_count);
+		}
+		pUser->grp_table = tblidx;
+		pUser->grp_size = new_size;
+	} else {
+		table = (int *)m_pMemory->GetAddress(pUser->grp_table);
+	}
+
+	table[pUser->grp_count] = gid;
+	pUser->grp_count++;
+
+	/* Compute new effective permissions */
+	pUser->eflags |= pGroup->addflags;
+
+	if (pGroup->immunity_level > pUser->immunity_level)
+	{
+		pUser->immunity_level = pGroup->immunity_level;
+	}
+
+	pUser->serialchange++;
+
+	return true;
+}
+
+bool AdminCache::IsValidAdmin(AdminId id)
+{
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	return (pUser != NULL && pUser->magic == USR_MAGIC_SET);
+}
+
+unsigned int AdminCache::GetAdminGroupCount(AdminId id)
+{
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	if (!pUser || pUser->magic != USR_MAGIC_SET)
+	{
+		return 0;
+	}
+
+	return pUser->grp_count;
+}
+
+GroupId AdminCache::GetAdminGroup(AdminId id, unsigned int index, const char **name)
+{
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	if (!pUser || pUser->magic != USR_MAGIC_SET || index >= pUser->grp_count)
+	{
+		return INVALID_GROUP_ID;
+	}
+
+	int *table = (int *)m_pMemory->GetAddress(pUser->grp_table);
+
+	GroupId gid = table[index];
+
+	if (name)
+	{
+		*name = GetGroupName(gid);
+	}
+
+	return gid;
+}
+
+const char *AdminCache::GetAdminPassword(AdminId id)
+{
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	if (!pUser || pUser->magic != USR_MAGIC_SET)
+	{
+		return NULL;
+	}
+
+	return m_pStrings->GetString(pUser->password);
+}
+
+void AdminCache::SetAdminPassword(AdminId id, const char *password)
+{	
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	if (!pUser || pUser->magic != USR_MAGIC_SET)
+	{
+		return;
+	}
+
+	int i_password = m_pStrings->AddString(password);
+	pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	pUser->password = i_password;
+}
+
+unsigned int AdminCache::FlagBitsToBitArray(FlagBits bits, bool array[], unsigned int maxSize)
+{
+	unsigned int i;
+	for (i=0; i<maxSize && i<AdminFlags_TOTAL; i++)
+	{
+		array[i] = ((bits & (1<<i)) == (unsigned)(1<<i));
+	}
+
+	return i;
+}
+
+FlagBits AdminCache::FlagBitArrayToBits(const bool array[], unsigned int maxSize)
+{
+	FlagBits bits = 0;
+	for (unsigned int i=0; i<maxSize && i<AdminFlags_TOTAL; i++)
+	{
+		if (array[i])
+		{
+			bits |= (1<<i);
+		}
+	}
+
+	return bits;
+}
+
+FlagBits AdminCache::FlagArrayToBits(const AdminFlag array[], unsigned int numFlags)
+{
+	FlagBits bits = 0;
+	for (unsigned int i=0; i<numFlags && i<AdminFlags_TOTAL; i++)
+	{
+		bits |= (1 << (FlagBits)array[i]);
+	}
+
+	return bits;
+}
+
+unsigned int AdminCache::FlagBitsToArray(FlagBits bits, AdminFlag array[], unsigned int maxSize)
+{
+	unsigned int i, num=0;
+	for (i=0; num<maxSize && i<AdminFlags_TOTAL; i++)
+	{
+		if ((bits & (1<<i)) == (unsigned)(1<<i))
+		{
+			array[num++] = (AdminFlag)i;
+		}
+	}
+
+	return num;
+}
+
+bool AdminCache::CheckAdminFlags(AdminId id, FlagBits bits)
+{
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	if (!pUser || pUser->magic != USR_MAGIC_SET)
+	{
+		return false;
+	}
+
+	return ((pUser->eflags & bits) == bits);
+}
+
+bool AdminCache::CanAdminTarget(AdminId id, AdminId target)
+{
+	/** 
+	 * Zeroth, if the targeting AdminId is INVALID_ADMIN_ID, targeting fails.
+	 * First, if the targeted AdminId is INVALID_ADMIN_ID, targeting succeeds.
+	 */
+
+	if (id == INVALID_ADMIN_ID)
+	{
+		return false;
+	}
+
+	if (target == INVALID_ADMIN_ID)
+	{
+		return true;
+	}
+
+	if (id == target)
+	{
+		return true;
+	}
+
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	if (!pUser || pUser->magic != USR_MAGIC_SET)
+	{
+		return false;
+	}
+
+	AdminUser *pTarget = (AdminUser *)m_pMemory->GetAddress(target);
+	if (!pTarget || pTarget->magic != USR_MAGIC_SET)
+	{
+		return false;
+	}
+
+	/** 
+	 * Second, if the targeting admin is root, targeting succeeds.
+	 */
+	if (pUser->eflags & ADMFLAG_ROOT)
+	{
+		return true;
+	}
+
+	/** Fourth, if the targeted admin is immune from targeting admin. */
+	int mode = sm_immunity_mode.GetInt();
+	switch (mode)
+	{
+		case 1:
+		{
+			if (pTarget->immunity_level > pUser->immunity_level)
+			{
+				return false;
+			}
+			break;
+		}
+		case 3:
+		{
+			/* If neither has any immunity, let this pass. */
+			if (!pUser->immunity_level && !pTarget->immunity_level)
+			{
+				return true;
+			}
+			/* Don't break, go to the next case. */
+		}
+		case 2:
+		{
+			if (pTarget->immunity_level >= pUser->immunity_level)
+			{
+				return false;
+			}
+			break;
+		}
+	}
+
+	/** 
+	 * Fifth, if the targeted admin has specific immunity from the
+	 *  targeting admin via group immunities, targeting fails.
+	 */
+	//:TODO: speed this up... maybe with trie hacks.
+	//idea is to insert %d.%d in the trie after computing this and use it as a cache lookup.
+	//problem is the trie cannot delete prefixes, so we'd have a problem with invalidations.
+	if (pTarget->grp_count > 0 && pUser->grp_count > 0)
+	{
+		int *grp_table = (int *)m_pMemory->GetAddress(pTarget->grp_table);
+		int *src_table = (int *)m_pMemory->GetAddress(pUser->grp_table);
+		GroupId id, other;
+		unsigned int num;
+		for (unsigned int i=0; i<pTarget->grp_count; i++)
+		{
+			id = grp_table[i];
+			num = GetGroupImmunityCount(id);
+			for (unsigned int j=0; j<num; i++)
+			{
+				other = GetGroupImmunity(id, j);
+				for (unsigned int k=0; k<pUser->grp_count; k++)
+				{
+					if (other == src_table[k])
+					{
+						return false;
+					}
+				}
+			}
+		}
+	}
+	
+	return true;
+}
+
+bool AdminCache::FindFlag(char c, AdminFlag *pAdmFlag)
+{
+	if (c < 'a' || c > 'z')
+	{
+		return false;
+	}
+
+	if (pAdmFlag)
+	{
+		*pAdmFlag = g_FlagLetters[(unsigned)c - (unsigned)'a'];
+	}
+
+	return true;
+}
+
+FlagBits AdminCache::ReadFlagString(const char *flags, const char **end)
+{
+	FlagBits bits = 0;
+
+	while (flags && (*flags != '\0'))
+	{
+		AdminFlag flag;
+		if (!FindFlag(*flags, &flag))
+		{
+			break;
+		}
+		bits |= FlagArrayToBits(&flag, 1);
+		flags++;
+	}
+
+	if (end)
+	{
+		*end = flags;
+	}
+
+	return bits;
+}
+
+unsigned int AdminCache::GetAdminSerialChange(AdminId id)
+{
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	if (!pUser || pUser->magic != USR_MAGIC_SET)
+	{
+		return 0;
+	}
+
+	return pUser->serialchange;
+}
+
+bool AdminCache::CanAdminUseCommand(int client, const char *cmd)
+{
+	FlagBits bits;
+	OverrideType otype = Override_Command;
+
+	if (cmd[0] == '@')
+	{
+		otype = Override_CommandGroup;
+		cmd++;
+	}
+
+	if (!g_ConCmds.LookForCommandAdminFlags(cmd, &bits))
+	{
+		if (!GetCommandOverride(cmd, otype, &bits))
+		{
+			bits = 0;
+		}
+	}
+
+	return g_ConCmds.CheckCommandAccess(client, cmd, bits);
+}
+
+unsigned int AdminCache::SetGroupImmunityLevel(GroupId gid, unsigned int level)
+{
+	AdminGroup *pGroup = (AdminGroup *)m_pMemory->GetAddress(gid);
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return 0;
+	}
+
+	unsigned int old_level = pGroup->immunity_level;
+
+	pGroup->immunity_level = level;
+
+	return old_level;
+}
+
+unsigned int AdminCache::GetGroupImmunityLevel(GroupId gid)
+{
+	AdminGroup *pGroup = (AdminGroup *)m_pMemory->GetAddress(gid);
+	if (!pGroup || pGroup->magic != GRP_MAGIC_SET)
+	{
+		return 0;
+	}
+
+	return pGroup->immunity_level;
+}
+
+unsigned int AdminCache::SetAdminImmunityLevel(AdminId id, unsigned int level)
+{
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	if (!pUser || pUser->magic != USR_MAGIC_SET)
+	{
+		return 0;
+	}
+
+	unsigned int old_level = pUser->immunity_level;
+
+	pUser->immunity_level = level;
+
+	return old_level;
+}
+
+unsigned int AdminCache::GetAdminImmunityLevel(AdminId id)
+{
+	AdminUser *pUser = (AdminUser *)m_pMemory->GetAddress(id);
+	if (!pUser || pUser->magic != USR_MAGIC_SET)
+	{
+		return 0;
+	}
+
+	return pUser->immunity_level;
+}
+
+bool AdminCache::CheckAccess(int client, const char *cmd, FlagBits flags, bool override_only)
+{
+	if (client == 0)
+	{
+		return true;
+	}
+
+	/* Auto-detect a command if we can */
+	FlagBits bits = flags;
+	bool found_command = false;
+	if (!override_only)
+	{
+		found_command = g_ConCmds.LookForCommandAdminFlags(cmd, &bits);
+	}
+
+	if (!found_command)
+	{
+		GetCommandOverride(cmd, Override_Command, &bits);
+	}
+
+	return g_ConCmds.CheckCommandAccess(client, cmd, bits) ? 1 : 0;
+}