Allow nick locking to prevent voluntary changes to UID

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12322 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 1 insertions, 7 deletions

diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index e4f12c7bc..47c8bc836 100644
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -198,7 +198,7 @@ class ModuleNickFlood : public Module
 
 	ModResult OnUserPreNick(User* user, const std::string &newnick)
 	{
-		if (isdigit(newnick[0])) /* allow switches to UID */
+		if (ServerInstance->NICKForced.get(user)) /* Allow forced nick changes */
 			return MOD_RES_PASSTHRU;
 
 		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index f413696dc..dd65a5a74 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -175,9 +175,6 @@ class ModuleNickLock : public Module
 		if (!IS_LOCAL(user))
 			return MOD_RES_PASSTHRU;
 
-		if (isdigit(newnick[0])) /* Allow a switch to a UID */
-			return MOD_RES_PASSTHRU;
-
 		if (ServerInstance->NICKForced.get(user)) /* Allow forced nick changes */
 			return MOD_RES_PASSTHRU;
 
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 5fa5c3227..8713ffe96 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -76,9 +76,6 @@ class ModuleNoNickChange : public Module
 		if (!IS_LOCAL(user))
 			return MOD_RES_PASSTHRU;
 
-		if (isdigit(newnick[0])) /* don't even think about touching a switch to uid! */
-			return MOD_RES_PASSTHRU;
-
 		// Allow forced nick changes.
 		if (ServerInstance->NICKForced.get(user))
 			return MOD_RES_PASSTHRU;