Two small bugfixes.

I'm not sure why we're getting a new version of authcmds/commandlist.c though, but hey it's autogenerated!

diff --git a/chanserv/authcmds/commandlist.c b/chanserv/authcmds/commandlist.c
index 9cbc789ecc79568577cfc0b238d573ac03645de4..e251b3d6ac388e4780aefdf434f789c440e98791 100644 (file)
--- a/chanserv/authcmds/commandlist.c
+++ b/chanserv/authcmds/commandlist.c
@@ -30,7 +30,7 @@ void _init() {
   chanservaddcommand("login", QCMD_SECURE | QCMD_NOTAUTHED | QCMD_ALIAS, 2, csa_doauth, "Authenticates you on the bot.", "Usage: LOGIN <username> <password>\nAuthenticates you on the bot, where:\nusername - your username\npassword - your password\nIf you do not have a username and password, see HELLO.\nNote: due to the sensitive nature of this command, you must send the message\nto Q@CServe.quakenet.org when using it.\nNote: the preferred way to authenticate is to use the /AUTH command.\n");
   chanservaddcommand("newpass", QCMD_SECURE | QCMD_AUTHED, 3, csa_donewpw, "Change your password.", "Usage: NEWPASS <oldpassword> <newpassword> <newpassword>\nChanges your account password.  Your new password must be at least 6 characters\nlong, contain at least one number and one letter, and may not contain sequences\nof letters or numbers.  Your new password will be sent to your registered email\naddress.  Where:\noldpassword - your existing account password\nnewpassword - your desired new password.  Must be entered the same both times.\nNote: due to the sensitive nature of this command, you must send the message to\nQ@CServe.quakenet.org when using it.\n");
   chanservaddcommand("requestpassword", QCMD_NOTAUTHED, 1, csa_doreqpw, "Requests the current password by email.", "Usage: REQUESTPASSWORD <email>\nSends your current password to your registered email address, where:\nemail    - your registered email address\n");
-  chanservaddcommand("sendpassword", QCMD_OPER, 1, csa_dosendpw, "Sends the users current password by email.", "Usage: SENDPASSWORD <username>\nSends the password for the specified account to the specified users email address.\n");
+  chanservaddcommand("sendpassword", QCMD_HELPER, 1, csa_dosendpw, "Sends the users current password by email.", "Usage: SENDPASSWORD <username>\nSends the password for the specified account to the specified users email address.\n");
   chanservaddcommand("setemail", QCMD_OPER, 2, csa_dosetmail, "Set the email address.", "");
   chanservaddcommand("setpassword", QCMD_OPER, 2, csa_dosetpw, "Set a new password.", "");
 }

diff --git a/chanserv/chanservdb_updates.c b/chanserv/chanservdb_updates.c
index b4fcc8ed9703cfd98b55824742448275d66fa5aa..873a845c12798002b250447b4f337bcc11282999 100644 (file)
--- a/chanserv/chanservdb_updates.c
+++ b/chanserv/chanservdb_updates.c
@@ -81,7 +81,7 @@ void csdb_updatechannel(regchan *rcp) {
   pqquery("UPDATE channels SET name='%s', flags=%d, forcemodes=%d,"
                  "denymodes=%d, chanlimit=%d, autolimit=%d, banstyle=%d,"
                  "lastactive=%lu,statsreset=%lu, banduration=%lu, founder=%u,"
-                 "addedby=%u, suspendby=%u, supendtime=%lu, chantype=%d, totaljoins=%u,"
+                 "addedby=%u, suspendby=%u, suspendtime=%lu, chantype=%d, totaljoins=%u,"
                  "tripjoins=%u, maxusers=%u, tripusers=%u,"
                  "welcome='%s', topic='%s', chankey='%s', suspendreason='%s',"
                  "comment='%s', lasttimestamp=%d WHERE ID=%u",escname,rcp->flags,rcp->forcemodes,

diff --git a/chanserv/chanservuser.c b/chanserv/chanservuser.c
index fbf6f5274048eeae5478884bf9373cf3a388de90..fa05a4e4862c6c81e541624f77c2b16e71101cbb 100644 (file)
--- a/chanserv/chanservuser.c
+++ b/chanserv/chanservuser.c
@@ -557,6 +557,7 @@ void cs_checknick(nick *np) {
       rup->suspendby=0;
       rup->suspendexp=0;
       rup->suspendtime=0;
+      rup->lockuntil=0;
       rup->password[0]='\0';
       rup->email=NULL;
       rup->localpart=NULL;