Added trust flag.

Some people haven't been keeping the _ALL defines upto date!
Admins can now set users as cleanup exempt.

diff --git a/chanserv/chanserv.c b/chanserv/chanserv.c
index aaf535e35a9328511772108415e5ba7620829388..9f319e91a28850d12835cd36014e9402852be7ed 100644 (file)
--- a/chanserv/chanserv.c
+++ b/chanserv/chanserv.c
@@ -63,6 +63,7 @@ const flag ruflags[] = {
   { 'o',  QUFLAG_OPER },
   { 'p',  QUFLAG_PROTECT },
   { 'r',  QUFLAG_RESTRICTED },
+  { 'T',  QUFLAG_TRUST },
   { 'z',  QUFLAG_SUSPENDED },
   { '\0', 0 } };
 

diff --git a/chanserv/chanserv.h b/chanserv/chanserv.h
index fa19c7bd9570772295d83f891e2bc2bf10d1053f..336dc004df2a5e7a092ecdc607267666a1174688 100644 (file)
--- a/chanserv/chanserv.h
+++ b/chanserv/chanserv.h
@@ -292,7 +292,8 @@
 #define   QUFLAG_DELAYEDGLINE  0x0800  /* +G */
 #define   QUFLAG_NOAUTHLIMIT   0x1000  /* +L */
 #define   QUFLAG_CLEANUPEXEMPT 0x4000  /* +D */
-#define   QUFLAG_ALL          0x1fff
+#define   QUFLAG_TRUST         0x8000  /* +T */
+#define   QUFLAG_ALL           0xdfff
 
 #define UIsNeedAuth(x)      ((x)->flags & QUFLAG_NEEDAUTH)
 #define UIsGline(x)         ((x)->flags & QUFLAG_GLINE)
@@ -423,7 +424,7 @@
                               QCFLAG_PROTECT|QCFLAG_TOPICSAVE|QCFLAG_VOICEALL| \
                               QCFLAG_WELCOME|QCFLAG_KNOWNONLY)
 
-#define   QCFLAG_ALL          0x7fff
+#define   QCFLAG_ALL          0x7bff
 
 
 /* Channel user ("chanlev") flags */
@@ -456,7 +457,7 @@
 
 #define   QCUFLAGS_PERSONAL (QCUFLAG_HIDEINFO | QCUFLAG_HIDEWELCOME | QCUFLAG_AUTOINVITE)
 
-#define   QCUFLAG_ALL         0xffff
+#define   QCUFLAG_ALL         0xffdf
 
 #define   CUIsOwner(x)        ((x)->flags & QCUFLAG_OWNER)
 #define   CUIsMaster(x)       ((x)->flags & QCUFLAG_MASTER)

diff --git a/chanserv/usercmds/userflags.c b/chanserv/usercmds/userflags.c
index ce3cd1a4e178133dc3c592e26163110f973a6c3a..71793f3c0135a9e0a1da5db0ab66024fd33be7a9 100644 (file)
--- a/chanserv/usercmds/userflags.c
+++ b/chanserv/usercmds/userflags.c
@@ -70,10 +70,10 @@ int csu_douserflags(void *source, int cargc, char **cargv) {
     /* Warning, policy ahead */
 
     if (UHasOperPriv(rup))
-      changemask |= QUFLAG_GLINE | QUFLAG_DELAYEDGLINE | QUFLAG_RESTRICTED | QUFLAG_PROTECT;
+      changemask |= QUFLAG_GLINE | QUFLAG_DELAYEDGLINE | QUFLAG_RESTRICTED | QUFLAG_PROTECT | QUFLAG_TRUST;
 
     if (UHasAdminPriv(rup))
-      changemask |= (QUFLAG_OPER | QUFLAG_HELPER);
+      changemask |= (QUFLAG_OPER | QUFLAG_HELPER | QUFLAG_CLEANUPEXEMPT);
     
     if (UIsDev(rup))
       changemask=QUFLAG_ALL;