Remove silly a2client_p, entirely pointless since User.server removal.

[irc/rqf/shadowircd.git] / include / s_newconf.h

diff --git a/include/s_newconf.h b/include/s_newconf.h
index 61795351fd4e8c063d562ffbeeda5dbf5c0b5fba..3a2a5064c271bcd794b5d30d675d5d120c71db11 100644 (file)
--- a/include/s_newconf.h
+++ b/include/s_newconf.h
@@ -92,7 +92,7 @@ struct remote_conf
 #define SHARED_TXLINE  0x0010
 #define SHARED_PXLINE  0x0020
 #define SHARED_UNXLINE 0x0040
-#define SHARED_TRESV   0x0800
+#define SHARED_TRESV   0x0080
 #define SHARED_PRESV   0x0100
 #define SHARED_UNRESV  0x0200
 #define SHARED_REHASH  0x0400
@@ -152,14 +152,14 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
 #define OPER_INVIS     0x08000
 #define OPER_SPY       0x10000
 #define OPER_REMOTEBAN 0x20000
-/*                     0x40000         */
-/* 0x80000 and above are in client.h */
+#define OPER_MASSNOTICE 0x40000
+/* 0x400000 and above are in client.h */
 
 #define OPER_FLAGS     (OPER_KLINE|OPER_UNKLINE|OPER_LOCKILL|OPER_GLOBKILL|\
                         OPER_REMOTE|OPER_GLINE|OPER_XLINE|OPER_RESV|\
                         OPER_NICKS|OPER_REHASH|OPER_DIE|OPER_ADMIN|\
                         OPER_HADMIN|OPER_OPERWALL|OPER_INVIS|OPER_SPY|\
-                        OPER_REMOTEBAN)
+                        OPER_REMOTEBAN|OPER_MASSNOTICE)
 
 #define IsOperConfEncrypted(x) ((x)->flags & OPER_ENCRYPTED)
 
@@ -171,6 +171,7 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
 #define IsOperN(x)              ((x)->flags2 & OPER_NICKS)
 #define IsOperK(x)              ((x)->flags2 & OPER_KLINE)
 #define IsOperXline(x)          ((x)->flags2 & OPER_XLINE)
+#define IsOperResv(x)           ((x)->flags2 & OPER_RESV)
 #define IsOperDie(x)            ((x)->flags2 & OPER_DIE)
 #define IsOperRehash(x)         ((x)->flags2 & OPER_REHASH)
 #define IsOperHiddenAdmin(x)    ((x)->flags2 & OPER_HADMIN)
@@ -180,6 +181,7 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
 #define IsOperSpy(x)            ((x)->flags2 & OPER_SPY)
 #define IsOperInvis(x)          ((x)->flags2 & OPER_INVIS)
 #define IsOperRemoteBan(x)     ((x)->flags2 & OPER_REMOTEBAN)
+#define IsOperMassNotice(x)    ((x)->flags2 & OPER_MASSNOTICE)
 
 extern struct oper_conf *make_oper_conf(void);
 extern void free_oper_conf(struct oper_conf *);
@@ -237,7 +239,9 @@ extern void set_server_conf_autoconn(struct Client *source_p, char *name,
 
 
 extern struct ConfItem *find_xline(const char *, int);
+extern struct ConfItem *find_xline_mask(const char *);
 extern struct ConfItem *find_nick_resv(const char *name);
+extern struct ConfItem *find_nick_resv_mask(const char *name);
 
 extern int valid_wild_card_simple(const char *);
 extern int clean_resv_nick(const char *);
@@ -247,9 +251,6 @@ struct nd_entry
 {
        char name[NICKLEN+1];
        time_t expire;
-       unsigned int hashv;
-
-       dlink_node hnode;       /* node in hash */
        dlink_node lnode;       /* node in ll */
 };