synced with the ircu2.10.12.14 release

diff --git a/ChangeLog b/ChangeLog
index 604aacdadd645411a1f496a563807acf2199bb8a..edc241637b025fccd20d656243e08abb680019a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-08-17  Kevin L. Mitchell <klmitch@mit.edu>
+
+       * include/client.h: Fix minor issue in IsLocOp() test
+
+       * include/patchlevel.h (PATCHLEVEL): bump patchlevel to 14
+
+2011-05-15  Michael Poole  <mdpoole@troilus.org>
+
+       * ircd/s_auth.c (iauth_cmd_done_account): Do not copy the
+       account's creation timestamp into the account name.
+
 2010-07-05  Kevin L. Mitchell  <klmitch@mit.edu>
 
        * include/patchlevel.h (PATCHLEVEL): bump patchlevel from -rc2 to

diff --git a/ircd/s_auth.c b/ircd/s_auth.c
index 7a2c89920e1539731759d21ba1b2ee07cc281a26..de5d64586de95ae303fb2cb799ac140b1bc6a4ca 100644 (file)
--- a/ircd/s_auth.c
+++ b/ircd/s_auth.c
@@ -2303,8 +2303,10 @@ static int iauth_cmd_done_account(struct IAuth *iauth, struct Client *cli,
   }
   /* If account has a creation timestamp, use it. */
   assert(cli_user(cli) != NULL);
-  if (params[0][len] == ':')
+  if (params[0][len] == ':') {
     cli_user(cli)->acc_create = strtoul(params[0] + len + 1, NULL, 10);
+    params[0][len] = '\0';
+  }
 
   /* Copy account name to User structure. */
   ircd_strncpy(cli_user(cli)->account, params[0], ACCOUNTLEN);