Remove QUFLAG_RESTRICTED; it doesn't do anything.

diff --git a/chanserv/chanserv.c b/chanserv/chanserv.c
index 1a56dbdf68e6a8e7f283c509f2a7cfa97556ea90..eef87825371628d6f2df91282c135395645fbb3f 100644 (file)
--- a/chanserv/chanserv.c
+++ b/chanserv/chanserv.c
@@ -64,7 +64,6 @@ const flag ruflags[] = {
   { 'n',  QUFLAG_NOTICE },
   { '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 388143dccdf85f667f90248580764283338abfc5..b3006a4320591c19537a6f413960fb070e1a7a77 100644 (file)
--- a/chanserv/chanserv.h
+++ b/chanserv/chanserv.h
@@ -302,7 +302,7 @@
 /* SPARE FLAG                  0x0001 */
 #define   QUFLAG_GLINE         0x0002  /* +g */
 #define   QUFLAG_NOTICE        0x0004  /* +n */
-#define   QUFLAG_RESTRICTED    0x0008  /* +r */
+/* SPARE FLAG                  0x0008 */
 #define   QUFLAG_SUSPENDED     0x0010  /* +z */
 #define   QUFLAG_OPER          0x0020  /* +o */
 #define   QUFLAG_DEV           0x0040  /* +d */
@@ -314,11 +314,10 @@
 #define   QUFLAG_NOAUTHLIMIT   0x1000  /* +L */
 #define   QUFLAG_CLEANUPEXEMPT 0x4000  /* +D */
 #define   QUFLAG_TRUST         0x8000  /* +T */
-#define   QUFLAG_ALL           0xdffe
+#define   QUFLAG_ALL           0xdff6
 
 #define UIsGline(x)         ((x)->flags & QUFLAG_GLINE)
 #define UIsNotice(x)        ((x)->flags & QUFLAG_NOTICE)
-#define UIsRestricted(x)    ((x)->flags & QUFLAG_RESTRICTED)
 #define UIsSuspended(x)     ((x)->flags & QUFLAG_SUSPENDED)
 #define UIsOper(x)          ((x)->flags & QUFLAG_OPER)
 #define UIsDev(x)           ((x)->flags & QUFLAG_DEV)
@@ -338,7 +337,6 @@
 
 #define USetGline(x)         ((x)->flags |= QUFLAG_GLINE)
 #define USetNotice(x)        ((x)->flags |= QUFLAG_NOTICE)
-#define USetRestricted(x)    ((x)->flags |= QUFLAG_RESTRICTED)
 #define USetSuspended(x)     ((x)->flags |= QUFLAG_SUSPENDED)
 #define USetOper(x)          ((x)->flags |= QUFLAG_OPER)
 #define USetDev(x)           ((x)->flags |= QUFLAG_DEV)
@@ -353,7 +351,6 @@
 
 #define UClearGline(x)         ((x)->flags &= ~QUFLAG_GLINE)
 #define UClearNotice(x)        ((x)->flags &= ~QUFLAG_NOTICE)
-#define UClearRestricted(x)    ((x)->flags &= ~QUFLAG_RESTRICTED)
 #define UClearSuspended(x)     ((x)->flags &= ~QUFLAG_SUSPENDED)
 #define UClearOper(x)          ((x)->flags &= ~QUFLAG_OPER)
 #define UClearDev(x)           ((x)->flags &= ~QUFLAG_DEV)

diff --git a/chanserv/usercmds/userflags.c b/chanserv/usercmds/userflags.c
index 4861eea0a1dc0c22ea048f4cf60472ecbbf25c58..d3970c7a2dc6939db8d1cc0a4b49eb23add0d8de 100644 (file)
--- a/chanserv/usercmds/userflags.c
+++ b/chanserv/usercmds/userflags.c
@@ -66,7 +66,7 @@ int csu_douserflags(void *source, int cargc, char **cargv) {
     /* Warning, policy ahead */
 
     if (UHasOperPriv(rup))
-      changemask |= QUFLAG_GLINE | QUFLAG_DELAYEDGLINE | QUFLAG_RESTRICTED | QUFLAG_PROTECT | QUFLAG_TRUST;
+      changemask |= QUFLAG_GLINE | QUFLAG_DELAYEDGLINE | QUFLAG_PROTECT | QUFLAG_TRUST;
 
     if (UHasAdminPriv(rup))
       changemask |= (QUFLAG_OPER | QUFLAG_HELPER | QUFLAG_CLEANUPEXEMPT);