Merge pull request #335 from edk0/post-registration-delay

[solanum.git] / include / s_newconf.h

diff --git a/include/s_newconf.h b/include/s_newconf.h
index 7a489b1a8f30e5ff456812c72d48148e6b97856e..4decc5a390cf54813f17ff86dc3c496acfd407c3 100644 (file)
--- a/include/s_newconf.h
+++ b/include/s_newconf.h
@@ -146,7 +146,7 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
 #define IsOperConfEncrypted(x) ((x)->flags & OPER_ENCRYPTED)
 #define IsOperConfNeedSSL(x)   ((x)->flags & OPER_NEEDSSL)
 
-#define HasPrivilege(x, y)     ((x)->localClient != NULL && (x)->localClient->privset != NULL && privilegeset_in_set((x)->localClient->privset, (y)))
+#define HasPrivilege(x, y)     ((x)->user != NULL && (x)->user->privset != NULL && privilegeset_in_set((x)->user->privset, (y)))
 
 #define IsOperGlobalKill(x)     (HasPrivilege((x), "oper:global_kill"))
 #define IsOperLocalKill(x)      (HasPrivilege((x), "oper:local_kill"))
@@ -166,6 +166,8 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
 #define IsOperRemoteBan(x)     (HasPrivilege((x), "oper:remoteban"))
 #define IsOperMassNotice(x)    (HasPrivilege((x), "oper:mass_notice"))
 
+#define SeesOper(target, source)       (IsOper((target)) && ((!ConfigFileEntry.hide_opers && !HasPrivilege((target), "oper:hidden")) || IsOper((source))))
+
 extern struct oper_conf *make_oper_conf(void);
 extern void free_oper_conf(struct oper_conf *);
 extern void clear_oper_conf(void);
@@ -181,10 +183,8 @@ struct server_conf
        char *connect_host;
        struct rb_sockaddr_storage connect4;
        uint16_t dns_query_connect4;
-#ifdef RB_IPV6
        struct rb_sockaddr_storage connect6;
        uint16_t dns_query_connect6;
-#endif
        char *passwd;
        char *spasswd;
        char *certfp;
@@ -197,10 +197,8 @@ struct server_conf
        char *bind_host;
        struct rb_sockaddr_storage bind4;
        uint16_t dns_query_bind4;
-#ifdef RB_IPV6
        struct rb_sockaddr_storage bind6;
        uint16_t dns_query_bind6;
-#endif
 
        char *class_name;
        struct Class *class;
@@ -214,12 +212,14 @@ struct server_conf
 #define SERVER_AUTOCONN                0x0020
 #define SERVER_SSL             0x0040
 #define SERVER_NO_EXPORT       0x0080
+#define SERVER_SCTP            0x0100
 
 #define ServerConfIllegal(x)   ((x)->flags & SERVER_ILLEGAL)
 #define ServerConfEncrypted(x) ((x)->flags & SERVER_ENCRYPTED)
 #define ServerConfCompressed(x)        ((x)->flags & SERVER_COMPRESSED)
 #define ServerConfTb(x)                ((x)->flags & SERVER_TB)
 #define ServerConfAutoconn(x)  ((x)->flags & SERVER_AUTOCONN)
+#define ServerConfSCTP(x)      ((x)->flags & SERVER_SCTP)
 #define ServerConfSSL(x)       ((x)->flags & SERVER_SSL)
 #define ServerConfNoExport(x)  ((x)->flags & SERVER_NO_EXPORT)