Merge.

diff --cc chanserv/usercmds/userflags.c
index 1094dda79bfd37d962ed52f19d06a911743324f5,9961ad8338b3f9429bc3a2d09e3411920bc54ef1..b86f8a407944f7e1a3566046c18ca4e6983d2031
--- 1/chanserv/usercmds/userflags.c
--- 2/chanserv/usercmds/userflags.c
+++ b/chanserv/usercmds/userflags.c
@@@ -66,10 -66,10 +66,10 @@@ int csu_douserflags(void *source, int c
      /* Warning, policy ahead */
  
      if (UHasOperPriv(rup))
 -      changemask |= QUFLAG_GLINE | QUFLAG_DELAYEDGLINE | QUFLAG_PROTECT | QUFLAG_TRUST | QCFLAG_NOINFO;
 +      changemask |= QUFLAG_PROTECT | QUFLAG_TRUST | QCFLAG_NOINFO;
  
      if (UHasAdminPriv(rup))
-       changemask |= (QUFLAG_OPER | QUFLAG_HELPER | QUFLAG_CLEANUPEXEMPT);
+       changemask |= (QUFLAG_OPER | QUFLAG_HELPER | QUFLAG_CLEANUPEXEMPT | QUFLAG_STAFF);
      
      if (UIsDev(rup))
        changemask=QUFLAG_ALL;