Merge.

[irc/quakenet/newserv.git] / chanserv / authcmds / auth.c

diff --git a/chanserv/authcmds/auth.c b/chanserv/authcmds/auth.c
index 78cf6e5aeb88f32334f7f7c73f03d1dc9c2af309..e0a6f7f947fbba9e479e6d7356863e56d7c3a9f5 100644 (file)
--- a/chanserv/authcmds/auth.c
+++ b/chanserv/authcmds/auth.c
@@ -2,7 +2,7 @@
  *
  *
  * CMDNAME: auth
- * CMDALIASES: login
+ * CMDALIASES: login ircdauth
  * CMDLEVEL: QCMD_SECURE | QCMD_NOTAUTHED
  * CMDARGS: 2
  * CMDDESC: Authenticates you on the bot.
@@ -135,6 +135,10 @@ int csa_completeauth(nick *sender, reguser *rup, char *authtype) {
       chanservstdmessage(sender, QM_EXPIRES, rup->suspendexp);
     return CMD_ERROR;
   }
+  if (UIsInactive(rup)) {
+    chanservstdmessage(sender, QM_INACTIVEACCOUNT);
+    return CMD_ERROR;
+  }
   
   /* Guarantee a unique auth timestamp for each account */
   oldlastauth=rup->lastauth;