fix nickname checks in register nick

diff --git a/ChangeLog b/ChangeLog
index ff1e16fb049187aa710d5427f1b2c12a54e5dca0..385ad3de6dbdb9abe910c15bdae62d25d4706768 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 /***********************************************************************
 X3 ChangeLog
 
+2007-03-20  Alex Schumann  <rubin@afternet.org>
+
+       * src/nickserv.c: applied patch from playa which fixes the nickname
+       valid checks when registering a nick.
+
 2007-03-20  Alex Schumann  <rubin@afternet.org>
  
         * src/nickserv.c: fix trying to do ldap when not enabled during

diff --git a/src/nickserv.c b/src/nickserv.c
index 89e6ccdf472f1bb7e7141748d9e33ae1b89e09b1..5a01d35a50f26d535ff78683172a7536aaee9fe7 100644 (file)
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -673,8 +673,16 @@ is_valid_handle(const char *handle)
 static int
 is_registerable_nick(const char *nick)
 {
-    /* make sure it could be used as an account name */
-    if (!is_valid_handle(nick))
+    struct userNode *user;
+    /* cant register a juped nick/service nick as nick, to prevent confusion */
+    user = GetUserH(nick);
+    if (user && IsLocal(user))
+        return 0;
+    /* for consistency, only allow nicks names that could be nicks */
+    if (!is_valid_nick(nick))
+        return 0;
+    /* disallow nicks that look like bad words */
+    if (opserv_bad_channel(nick))
         return 0;
     /* check length */
     if (strlen(nick) > NICKLEN)