Added support for LDAP auth registering initial nick when nick registration is enabled

diff --git a/ChangeLog b/ChangeLog
index 497430d75fc8df8ec9da81deb5e198a824ca5701..0a4111d8ef0405c3194dabf147ba9623c737e1dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 /***********************************************************************
 X3 ChangeLog
 
+2010-01-14  Matthew Beeching  <jobe@mdbnet.co.uk>
+
+       * src/nickserv.c: Added support for LDAP auth registering initial
+       nick when nick registration is enabled.
+
 2010-01-09  Neil Spierling  <sirvulcan@sirvulcan.co.nz>
 
        * Srvx sync. Author: Michael Poole.

diff --git a/src/nickserv.c b/src/nickserv.c
index 30ead1e65fccbe6389f4d26da637ba18159ada8f..25d3b7ba2c92394ad7dfb777afd4de3e0a81f57e 100644 (file)
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -1179,6 +1179,11 @@ nickserv_register(struct userNode *user, struct userNode *settee, const char *ha
             send_message(user, nickserv, "NSMSG_REGISTER_HN_SUCCESS");
           }
         }
+        else {
+          if (is_registerable_nick(handle)) {
+            register_nick(handle, hi);
+          }
+        }
     }
     if (settee && (user != settee)) {
       if(user) {
@@ -2281,7 +2286,7 @@ static NICKSERV_FUNC(cmd_auth)
             * create the account.
             */
              char *mask;
-             if(!(hi = nickserv_register(user, NULL, argv[1], argv[2], 0))) {
+             if(!(hi = nickserv_register(user, user, argv[1], argv[2], 0))) {
                 reply("NSMSG_UNABLE_TO_ADD");
                 return 0; /* couldn't add the user for some reason */
              }