Don't lock staff accounts on newpass/email and don't permit staff accounts to be...

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

diff --git a/chanserv/authcmds/email.c b/chanserv/authcmds/email.c
index 935845e22ca534ed756a8580b6f6bda8015ad30e..bbf424cceba011f78b45532b9c328a42018f16bf 100644 (file)
--- a/chanserv/authcmds/email.c
+++ b/chanserv/authcmds/email.c
@@ -52,7 +52,7 @@ int csa_doemail(void *source, int cargc, char **cargv) {
     return CMD_ERROR;
   }
 
-  if(rup->lockuntil && rup->lockuntil > t) {
+  if(!UHasHelperPriv(rup) && (rup->lockuntil && rup->lockuntil > t)) {
     char buf[100];
     strftime(buf, 15, "%d/%m/%y %H:%M", gmtime(&(rup->lockuntil)));
     chanservstdmessage(sender, QM_ACCOUNTLOCKED, buf);
@@ -124,7 +124,8 @@ int csa_doemail(void *source, int cargc, char **cargv) {
   rup->email=getsstring(cargv[1],EMAILLEN);
   rup->lastemailchange=t;
   rup->domain=findorcreatemaildomain(rup->email->content);
-  rup->lockuntil=t+7*24*3600;
+  if(!UHasHelperPriv(rup))
+    rup->lockuntil=t+7*24*3600;
   addregusertomaildomain(rup, rup->domain);
 
   if(local) {