CHANSERV: Replace Helper privs with Staff ones where it's required (mostly in staff...

Staff can now whois &accountid where before only helpers could (queue workers aren't necessarily in .support).

diff --git a/chanserv/authcmds/auth.c b/chanserv/authcmds/auth.c
index e55beb5c1d924afd6ad82bbbb36feae06352fe25..e5949b9604e43e29eae33af65a3c23c0c47aa7cc 100644 (file)
--- a/chanserv/authcmds/auth.c
+++ b/chanserv/authcmds/auth.c
@@ -92,7 +92,7 @@ int csa_completeauth(nick *sender, reguser *rup, char *authtype) {
 
   /* Check for too many auths.  Don't return immediately, since we will still warn
    * other users on the acct in this case. */
-  if (!UHasHelperPriv(rup) && !UIsNoAuthLimit(rup)) {
+  if (!UHasStaffPriv(rup) && !UIsNoAuthLimit(rup)) {
     if (anp->usercount >= MAXAUTHCOUNT) {
       chanservstdmessage(sender, QM_TOOMANYAUTHS);
       toomanyauths=1;

diff --git a/chanserv/authcmds/email.c b/chanserv/authcmds/email.c
index 1ea2f1ac18be0195709a912d9438a48f96817fd5..83cbeb55bd630c88522684a9bd51fed714e26675 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(!UHasHelperPriv(rup) && (rup->lockuntil && rup->lockuntil > t)) {
+  if(!UHasStaffPriv(rup) && (rup->lockuntil && rup->lockuntil > t)) {
     chanservstdmessage(sender, QM_ACCOUNTLOCKED, rup->lockuntil);
     return CMD_ERROR;
   }
@@ -122,7 +122,7 @@ int csa_doemail(void *source, int cargc, char **cargv) {
   rup->email=getsstring(cargv[1],EMAILLEN);
   rup->lastemailchange=t;
   rup->domain=findorcreatemaildomain(rup->email->content);
-  if(!UHasHelperPriv(rup)) {
+  if(!UHasStaffPriv(rup)) {
     rup->lockuntil=t+7*24*3600;
   } else {
     rup->lockuntil=0;

diff --git a/chanserv/authcmds/getpassword.c b/chanserv/authcmds/getpassword.c
index 77f57fa453f35e141e1e54432d2646cdd4f8fa75..26e07bb7d7684ef9dbb38b5712b2329b3d66217a 100644 (file)
--- a/chanserv/authcmds/getpassword.c
+++ b/chanserv/authcmds/getpassword.c
@@ -31,7 +31,7 @@ int csa_dogetpw(void *source, int cargc, char **cargv) {
   if (!(rup=findreguser(sender, cargv[0])))
     return CMD_ERROR;
 
-  if(UHasHelperPriv(rup)) {
+  if(UHasStaffPriv(rup)) {
     cs_log(sender,"GETPASSWORD FAILED username %s",rup->username);
     chanservwallmessage("%s (%s) just FAILED using GETPASSWORD on %s", sender->nick, srup->username, rup->username);
     chanservsendmessage(sender, "Sorry, that user is privileged.");

diff --git a/chanserv/authcmds/newpass.c b/chanserv/authcmds/newpass.c
index 64fc3bf496faba2dc2893b6902b8610331597ca4..b3c79c48bb04a54746b29dd989c462d11fb54a96 100644 (file)
--- a/chanserv/authcmds/newpass.c
+++ b/chanserv/authcmds/newpass.c
@@ -74,7 +74,7 @@ int csa_donewpw(void *source, int cargc, char **cargv) {
   }
 
   t=time(NULL);
-  if(!UHasHelperPriv(rup)) {
+  if(!UHasStaffPriv(rup)) {
     if(rup->lockuntil && rup->lockuntil > t) {
       chanservstdmessage(sender, QM_ACCOUNTLOCKED, rup->lockuntil);
       return CMD_ERROR;

diff --git a/chanserv/authcmds/requestpassword.c b/chanserv/authcmds/requestpassword.c
index 9cde52ce6b2f6183e89443a9a28fc093fc9cd481..bd6bd22df4cc4ce4d4406798109605a82a7745c7 100644 (file)
--- a/chanserv/authcmds/requestpassword.c
+++ b/chanserv/authcmds/requestpassword.c
@@ -34,7 +34,7 @@ int csa_doreqpw(void *source, int cargc, char **cargv) {
       if(!rup->email || strcasecmp(cargv[0],rup->email->content))
         continue;
 
-      if(UHasHelperPriv(rup)) {
+      if(UHasStaffPriv(rup)) {
         cs_log(sender,"REQUESTPASSWORD FAIL privileged email %s",cargv[0]);
         continue;
       }

diff --git a/chanserv/authcmds/reset.c b/chanserv/authcmds/reset.c
index 677e901ea2cf22bc40ecb9526e4069cc107d09eb..54421652885b58d05fadc9bedf47c07274d3177e 100644 (file)
--- a/chanserv/authcmds/reset.c
+++ b/chanserv/authcmds/reset.c
@@ -36,7 +36,7 @@ int csa_doreset(void *source, int cargc, char **cargv) {
     return CMD_ERROR;
 
   t=time(NULL);
-  if(UHasHelperPriv(rup) || (!rup->lockuntil || rup->lockuntil <= t)) {
+  if(UHasStaffPriv(rup) || (!rup->lockuntil || rup->lockuntil <= t)) {
     chanservstdmessage(sender, QM_ACCOUNTNOTLOCKED);
     return CMD_ERROR;
   }

diff --git a/chanserv/authcmds/sendpassword.c b/chanserv/authcmds/sendpassword.c
index 61339595c5254e694aa86974cdffad36e9f9212a..033e2f1581ff941ec74ae40a0fe1fbcb5448b4e7 100644 (file)
--- a/chanserv/authcmds/sendpassword.c
+++ b/chanserv/authcmds/sendpassword.c
@@ -30,7 +30,7 @@ int csa_dosendpw(void *source, int cargc, char **cargv) {
   if (!(rup=findreguser(sender, cargv[0])))
     return CMD_ERROR;
 
-  if(UHasHelperPriv(rup)) {
+  if(UHasStaffPriv(rup)) {
     chanservstdmessage(sender, QM_REQUESTPASSPRIVUSER);
     cs_log(sender,"SENDPASSWORD FAIL privilidged user %s",rup->username);
     return CMD_ERROR;

diff --git a/chanserv/authcmds/setemail.c b/chanserv/authcmds/setemail.c
index 33c7aee856d19bfc7fb7d35f362531ad9ca052d5..b76ed1354cecc804fe2b6327ab2a63dff9de591c 100644 (file)
--- a/chanserv/authcmds/setemail.c
+++ b/chanserv/authcmds/setemail.c
@@ -39,7 +39,7 @@ int csa_dosetmail(void *source, int cargc, char **cargv) {
   if (csa_checkeboy(sender, cargv[1]))
     return CMD_ERROR;
 
-  if(UHasHelperPriv(rup)) {
+  if(UHasStaffPriv(rup)) {
     cs_log(sender,"SETEMAIL FAILED username %s",rup->username);
     chanservwallmessage("%s (%s) just FAILED using SETEMAIL on %s: %s", sender->nick, vrup->username, rup->username, cargv[1]);
     chanservsendmessage(sender, "Sorry, that user is privileged.");

diff --git a/chanserv/authcmds/setpassword.c b/chanserv/authcmds/setpassword.c
index 80cd9ca4761aabfdf7221d81688d1dce35aa5b61..0eaa01357642cac44ff0607af9fca58ed32daa35 100644 (file)
--- a/chanserv/authcmds/setpassword.c
+++ b/chanserv/authcmds/setpassword.c
@@ -30,7 +30,7 @@ int csa_dosetpw(void *source, int cargc, char **cargv) {
   if (!(rup=findreguser(sender, cargv[0])))
     return CMD_ERROR;
 
-  if(UHasHelperPriv(rup)) {
+  if(UHasStaffPriv(rup)) {
     cs_log(sender,"GETPASSWORD FAILED username %s",rup->username);
     chanservwallmessage("%s (%s) just FAILED using SETPASSWORD on %s", sender->nick, vrup->username, rup->username);
     chanservsendmessage(sender, "Sorry, that user is privileged.");

diff --git a/chanserv/chanservstdcmds.c b/chanserv/chanservstdcmds.c
index 41427e180b9ad09fbcf0b5f6c35a00ffab00f6a7..eb47137f559275b22aff5f80b7cfa47fb21c3e61 100644 (file)
--- a/chanserv/chanservstdcmds.c
+++ b/chanserv/chanservstdcmds.c
@@ -140,7 +140,7 @@ int cs_doshowcommands(void *source, int cargc, char **cargv) {
     
     summary=(cmdsummary *)cmdlist[i]->ext;
     
-    if (rup && UHasHelperPriv(rup)) {
+    if (rup && UHasStaffPriv(rup)) {
       if (cmdlist[i]->level & QCMD_DEV) {
         sprintf(cmdbuf,"+d %s",cmdlist[i]->command->content);
       } else if(cmdlist[i]->level & QCMD_ADMIN) {
@@ -191,7 +191,8 @@ int cs_sendhelp(nick *sender, char *thecmd, int oneline) {
   rup=getreguserfromnick(sender);
   
   /* Don't showhelp for privileged users to others.. */
-  if (((cmd->level & QCMD_HELPER) && (!rup || !UHasHelperPriv(rup))) ||
+  if (((cmd->level & QCMD_STAFF) && (!rup || !UHasStaffPriv(rup))) ||
+      ((cmd->level & QCMD_HELPER) && (!rup || !UHasHelperPriv(rup))) ||
       ((cmd->level & QCMD_OPER) && (!rup || !UHasOperPriv(rup))) ||
       ((cmd->level & QCMD_ADMIN) && (!rup || !UHasAdminPriv(rup))) ||
       ((cmd->level & QCMD_DEV) && (!rup || !UIsDev(rup)))) {

diff --git a/chanserv/chanservuser.c b/chanserv/chanservuser.c
index 3b8fba7e50f6fb5590ddf01608bbdeeec58b31dd..b4ed4fa5d1c40a289174e8422f5e54e0d5699e9e 100644 (file)
--- a/chanserv/chanservuser.c
+++ b/chanserv/chanservuser.c
@@ -1291,7 +1291,7 @@ reguser *findreguser(nick *sender, const char *str) {
     }
     if (!(rup=findreguserbynick(str+1)) && sender)
       chanservstdmessage(sender, QM_UNKNOWNUSER, str);
-  } else if (*str=='&' && vrup && UHasHelperPriv(vrup)) {
+  } else if (*str=='&' && vrup && UHasStaffPriv(vrup)) {
     if (str[1]=='\0') {
       if (sender)
        chanservstdmessage(sender, QM_UNKNOWNUSER, str);

diff --git a/chanserv/usercmds/cleanupdb.c b/chanserv/usercmds/cleanupdb.c
index 2f79b09f3d34344f2cc79ef1e498119461e00460..4b688c2b43ef97e28db9637eec8b36054f84f6a1 100644 (file)
--- a/chanserv/usercmds/cleanupdb.c
+++ b/chanserv/usercmds/cleanupdb.c
@@ -42,7 +42,7 @@ int csu_docleanupdb(void *source, int cargc, char **cargv) {
       if (!(anp=findauthname(vrup->ID)))
         continue; /* should maybe raise hell instead */
 
-      if(!anp->nicks && !UHasHelperPriv(vrup) && !UIsCleanupExempt(vrup)) {
+      if(!anp->nicks && !UHasStaffPriv(vrup) && !UIsCleanupExempt(vrup)) {
         if(vrup->lastauth && (vrup->lastauth < to_age)) {
           expired++;
           cs_log(sender, "CLEANUPDB inactive user %s %u", vrup->username, vrup->ID);

diff --git a/chanserv/usercmds/deluser.c b/chanserv/usercmds/deluser.c
index d95de452e0adb76cfe38b6dcda618ddf2ef4561c..9da47ae377a6caaa517d246f8f67ab60e5f2ad97 100644 (file)
--- a/chanserv/usercmds/deluser.c
+++ b/chanserv/usercmds/deluser.c
@@ -32,7 +32,7 @@ int csu_dodeluser(void *source, int cargc, char **cargv) {
   if (!(target=findreguser(sender, cargv[0])))
     return CMD_ERROR;
   
-  if(UHasHelperPriv(target)) {
+  if(UHasStaffPriv(target)) {
     cs_log(sender,"DELUSER FAILED username %s (%s)",target->username,cargc>1?cargv[1]:"");
     chanservwallmessage("%s (%s) just FAILED using DELUSER on %s (%s)", sender->nick, rup->username, target->username, cargv[1]);
     chanservsendmessage(sender, "Sorry, that user is privileged.");

diff --git a/chanserv/usercmds/spewpassword.c b/chanserv/usercmds/spewpassword.c
index c56bf9adcf55019fdce704f5f31231beb88cd00f..7119c0c5ba61e20b107bd756156af5081922c04c 100644 (file)
--- a/chanserv/usercmds/spewpassword.c
+++ b/chanserv/usercmds/spewpassword.c
@@ -37,7 +37,7 @@ int csu_dospewpass(void *source, int cargc, char **cargv) {
   chanservstdmessage(sender, QM_SPEWHEADER);
   for (i=0;i<REGUSERHASHSIZE;i++) {
     for (dbrup=regusernicktable[i]; dbrup; dbrup=dbrup->nextbyname) {
-      if (!UHasHelperPriv(dbrup) && !match(cargv[0], dbrup->password)) {
+      if (!UHasStaffPriv(dbrup) && !match(cargv[0], dbrup->password)) {
         chanservsendmessage(sender, "%-15s %-10s %-30s %s", dbrup->username, UHasSuspension(dbrup)?"yes":"no", dbrup->email?dbrup->email->content:"none set", dbrup->lastuserhost?dbrup->lastuserhost->content:"none");
         count++;
         if (count >= 2000) {

diff --git a/chanserv/usercmds/suspenduser.c b/chanserv/usercmds/suspenduser.c
index 2df538607aa491e136b60182d0765158ea1c85df..55c99a06f624a3cbec71e1f95bfc12b34e42c07d 100644 (file)
--- a/chanserv/usercmds/suspenduser.c
+++ b/chanserv/usercmds/suspenduser.c
@@ -159,7 +159,7 @@ int csu_dosuspenduser(void *source, int cargc, char **cargv) {
           if (UHasSuspension(vrup))
             continue;
           
-          if (UHasHelperPriv(vrup))
+          if (UHasStaffPriv(vrup))
             continue;
           
           hitcount++;
@@ -186,7 +186,7 @@ int csu_dosuspenduser(void *source, int cargc, char **cargv) {
           if (UHasSuspension(vrup))
             continue;
           
-          if (UHasHelperPriv(vrup))
+          if (UHasStaffPriv(vrup))
             continue;
           
           hitcount++;
@@ -218,7 +218,7 @@ int csu_dosuspenduser(void *source, int cargc, char **cargv) {
       return CMD_ERROR;
     }
     
-    if (UHasHelperPriv(vrup)) {
+    if (UHasStaffPriv(vrup)) {
       snprintf(buf, 199, "suspenduser on %s", vrup->username);
       chanservstdmessage(sender, QM_NOACCESS, buf);
       chanservwallmessage("%s (%s) FAILED to suspend %s", sender->nick, rup->username, vrup->username);