merge

[irc/quakenet/newserv.git] / control / control.h

diff --git a/control/control.h b/control/control.h
index e9560aec95db9200584807f1f861885af078a89f..901cd53e78ff19f57cb4e2983686373b3d76f096 100644 (file)
--- a/control/control.h
+++ b/control/control.h
@@ -16,6 +16,7 @@ int controlrmmod(void *sender, int cargc, char **cargv);
 void controlspecialrmmod(void *arg);
 void controlspecialreloadmod(void *arg);
 void controlhelp(nick *np, Command *cmd);
+void controlnswall(int noticelevel, char *format, ...);
 
 #define registercontrolcmd(a, b, c, d) registercontrolhelpcmd(a, b, c, d, NULL)
 
@@ -32,7 +33,7 @@ extern CommandTree *controlcmds;
 struct specialsched {
   sstring *modulename;
   void *schedule;
-} specialsched;
+};
 
 /* NEVER USE THE FOLLOWING IN COMMANDS, you'll end up missing bits off and users'll end up being able to gline people */
 #define __NO_ANYONE      0x000
@@ -45,6 +46,7 @@ struct specialsched {
 #define __NO_OPER        0x040 /* +O */
 #define __NO_SEC         0x080 /* +w */
 #define __NO_DEVELOPER   0x100 /* +d */
+#define __NO_RELAY       0x200 /* +Y */
 
 /* These are dangerous, they don't include requiring /OPER or STAFF status, be careful */
 #define NOD_ACCOUNT   __NO_ACCOUNT | NO_AUTHED /* must contain authed else account won't be checked */
@@ -53,6 +55,7 @@ struct specialsched {
 #define NOD_OPER      __NO_OPER | NOD_ACCOUNT
 #define NOD_SEC       __NO_SEC | NOD_ACCOUNT
 #define NOD_DEVELOPER __NO_DEVELOPER | NOD_ACCOUNT
+#define NOD_RELAY     __NO_RELAY | NOD_ACCOUNT
 
 /* These ones are safe to use */
 #define NO_ANYONE       __NO_ANYONE                /* don't have to be authed to Q, or us, or opered or anything */
@@ -66,8 +69,9 @@ struct specialsched {
 #define NO_TRUST_OPER   NO_OPER | NOD_TRUST        /* must be authed to Q, /opered, and have trust and oper levels on bot */
 #define NO_SEC_STAFF    NO_STAFF | NOD_SEC         /* must be authed to Q, and have staff and sec level on bot */
 #define NO_SEC_OPER     NO_OPER | NOD_SEC          /* must be authed to Q, /opered, and have sec and oper levels on bot */
+#define NO_RELAY        NO_OPERED | NOD_RELAY      /* must be authed to Q, /opered, and have the relay level on bot */
 
-#define NO_ALL_FLAGS    __NO_STAFF | __NO_TRUST | __NO_OPER | __NO_SEC | __NO_DEVELOPER
+#define NO_ALL_FLAGS    __NO_STAFF | __NO_TRUST | __NO_OPER | __NO_SEC | __NO_DEVELOPER | __NO_RELAY
 #define NO_OPER_FLAGS   __NO_STAFF
 #define NO_DEV_FLAGS    NO_ALL_FLAGS