X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/29c8637abbfafd8a85a20fe1c3b37a0ffaae9d84..d5a432fa0092f39dbb517b5665f35dc87e5a88f7:/include/client.h

diff --git a/include/client.h b/include/client.h
index a37f946..f15444c 100644
--- a/include/client.h
+++ b/include/client.h
@@ -423,29 +423,26 @@ struct exit_client_hook
 /* umodes, settable flags */
 /* lots of this moved to snomask -- jilles */
 #define UMODE_SERVNOTICE   0x0001	/* server notices */
-#define UMODE_WALLOP       0x0100	/* send wallops to them */
-#define UMODE_OPERWALL     0x0200	/* Operwalls */
-#define UMODE_INVISIBLE    0x0400	/* makes user invisible */
-#define UMODE_CALLERID     0x2000	/* block unless caller id's */
-#define UMODE_LOCOPS       0x8000	/* show locops */
-#define UMODE_SERVICE      0x40000
-#define UMODE_DEAF	   0x80000
-#define UMODE_NOFORWARD    0x400000	/* don't forward */
-#define UMODE_REGONLYMSG   0x800000	/* only allow logged in users to msg */
+#define UMODE_WALLOP       0x0002	/* send wallops to them */
+#define UMODE_OPERWALL     0x0004	/* Operwalls */
+#define UMODE_INVISIBLE    0x0008	/* makes user invisible */
+#define UMODE_CALLERID     0x0010	/* block unless caller id's */
+#define UMODE_LOCOPS       0x0020	/* show locops */
+#define UMODE_SERVICE      0x0040
+#define UMODE_DEAF	   0x0080
+#define UMODE_NOFORWARD    0x0100	/* don't forward */
+#define UMODE_REGONLYMSG   0x0200	/* only allow logged in users to msg */
 
 /* user information flags, only settable by remote mode or local oper */
-#define UMODE_OPER         0x100000	/* Operator */
-#define UMODE_ADMIN        0x200000	/* Admin on server */
-#define UMODE_SSLCLIENT    0x1000000	/* using SSL */
-
-#define UMODE_ALL	   UMODE_SERVNOTICE
+#define UMODE_OPER         0x1000	/* Operator */
+#define UMODE_ADMIN        0x2000	/* Admin on server */
+#define UMODE_SSLCLIENT    0x4000	/* using SSL */
 
 /* overflow flags */
 /* EARLIER FLAGS ARE IN s_newconf.h */
 #define FLAGS2_EXEMPTRESV	0x00400000
-#define FLAGS2_EXEMPTGLINE      0x00800000
-#define FLAGS2_EXEMPTKLINE      0x01000000
-#define FLAGS2_EXEMPTFLOOD      0x02000000
+#define FLAGS2_EXEMPTKLINE      0x00800000
+#define FLAGS2_EXEMPTFLOOD      0x01000000
 #define FLAGS2_IP_SPOOFING      0x10000000
 #define FLAGS2_EXEMPTSPAMBOT	0x20000000
 #define FLAGS2_EXEMPTSHIDE	0x40000000
@@ -539,8 +536,6 @@ struct exit_client_hook
  */
 #define IsExemptKline(x)        ((x)->flags2 & FLAGS2_EXEMPTKLINE)
 #define SetExemptKline(x)       ((x)->flags2 |= FLAGS2_EXEMPTKLINE)
-#define IsExemptGline(x)        ((x)->flags2 & FLAGS2_EXEMPTGLINE)
-#define SetExemptGline(x)       ((x)->flags2 |= FLAGS2_EXEMPTGLINE)
 #define IsExemptFlood(x)        ((x)->flags2 & FLAGS2_EXEMPTFLOOD)
 #define SetExemptFlood(x)       ((x)->flags2 |= FLAGS2_EXEMPTFLOOD)
 #define IsExemptSpambot(x)	((x)->flags2 & FLAGS2_EXEMPTSPAMBOT)
@@ -575,7 +570,6 @@ struct exit_client_hook
 extern void check_banned_lines(void);
 extern void check_klines_event(void *unused);
 extern void check_klines(void);
-extern void check_glines(void);
 extern void check_dlines(void);
 extern void check_xlines(void);