Switched on using cache_user_motd(); for motd update on rehash

[solanum.git] / include / s_newconf.h

diff --git a/include/s_newconf.h b/include/s_newconf.h
index 66b1da48baf3919ee0ade80bea12d87c5e53adc0..083a90c01f8284fbc2d8cb1f0788a79d5bc49953 100644 (file)
--- a/include/s_newconf.h
+++ b/include/s_newconf.h
@@ -36,7 +36,6 @@
 #define INCLUDED_s_newconf_h
 
 #include "setup.h"
-#include "tools.h"
 
 #ifdef HAVE_LIBCRYPTO
 #include <openssl/rsa.h>
@@ -54,7 +53,7 @@ extern rb_dlink_list resv_conf_list;
 extern rb_dlink_list nd_list;
 extern rb_dlink_list tgchange_list;
 
-struct _patricia_tree_t *tgchange_tree;
+struct _rb_patricia_tree_t *tgchange_tree;
 
 extern void init_s_newconf(void);
 extern void clear_s_newconf(void);
@@ -140,7 +139,6 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
 #define OPER_LOCKILL   0x00008
 #define OPER_GLOBKILL  0x00010
 #define OPER_REMOTE    0x00020
-#define OPER_GLINE     0x00040
 #define OPER_XLINE     0x00080
 #define OPER_RESV      0x00100
 #define OPER_NICKS     0x00200
@@ -156,7 +154,7 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
 /* 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_REMOTE|OPER_XLINE|OPER_RESV|\
                         OPER_NICKS|OPER_REHASH|OPER_DIE|OPER_ADMIN|\
                         OPER_HADMIN|OPER_OPERWALL|OPER_INVIS|OPER_SPY|\
                         OPER_REMOTEBAN|OPER_MASSNOTICE)
@@ -167,7 +165,6 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
 #define IsOperLocalKill(x)      ((x)->flags2 & OPER_LOCKILL)
 #define IsOperRemote(x)         ((x)->flags2 & OPER_REMOTE)
 #define IsOperUnkline(x)        ((x)->flags2 & OPER_UNKLINE)
-#define IsOperGline(x)          ((x)->flags2 & OPER_GLINE)
 #define IsOperN(x)              ((x)->flags2 & OPER_NICKS)
 #define IsOperK(x)              ((x)->flags2 & OPER_KLINE)
 #define IsOperXline(x)          ((x)->flags2 & OPER_XLINE)
@@ -204,7 +201,7 @@ struct server_conf
        time_t hold;
 
        int aftype;
-       struct irc_sockaddr_storage my_ipnum;
+       struct rb_sockaddr_storage my_ipnum;
 
        char *class_name;
        struct Class *class;
@@ -217,6 +214,7 @@ struct server_conf
 #define SERVER_COMPRESSED      0x0008
 #define SERVER_TB              0x0010
 #define SERVER_AUTOCONN                0x0020
+#define SERVER_SSL             0x0040
 
 #define ServerConfIllegal(x)   ((x)->flags & SERVER_ILLEGAL)
 #define ServerConfVhosted(x)   ((x)->flags & SERVER_VHOSTED)
@@ -224,6 +222,7 @@ struct server_conf
 #define ServerConfCompressed(x)        ((x)->flags & SERVER_COMPRESSED)
 #define ServerConfTb(x)                ((x)->flags & SERVER_TB)
 #define ServerConfAutoconn(x)  ((x)->flags & SERVER_AUTOCONN)
+#define ServerConfSSL(x)       ((x)->flags & SERVER_SSL)
 
 extern struct server_conf *make_server_conf(void);
 extern void free_server_conf(struct server_conf *);