oper_conf structure: add privset association.

[solanum.git] / include / s_newconf.h

diff --git a/include/s_newconf.h b/include/s_newconf.h
index de73d859d3229ca9fa24abdcdbcca3843594d64c..ef2887fbb3814450bb8fba584369df4505fc5411 100644 (file)
--- a/include/s_newconf.h
+++ b/include/s_newconf.h
@@ -36,6 +36,7 @@
 #define INCLUDED_s_newconf_h
 
 #include "setup.h"
+#include "privilege.h"
 
 #ifdef HAVE_LIBCRYPTO
 #include <openssl/rsa.h>
@@ -101,8 +102,7 @@ struct remote_conf
 
 #define SHARED_ALL     (SHARED_TKLINE | SHARED_PKLINE | SHARED_UNKLINE |\
                        SHARED_PXLINE | SHARED_TXLINE | SHARED_UNXLINE |\
-                       SHARED_TRESV | SHARED_PRESV | SHARED_UNRESV |\
-                       SHARED_TDLINE | SHARED_PDLINE | SHARED_UNDLINE)
+                       SHARED_TRESV | SHARED_PRESV | SHARED_UNRESV)
 #define CLUSTER_ALL    (SHARED_ALL | SHARED_LOCOPS)
 
 /* flags used in hub/leaf */
@@ -121,6 +121,8 @@ struct oper_conf
 
        unsigned int snomask;
 
+       struct PrivilegeSet *privset;
+
 #ifdef HAVE_LIBCRYPTO
        char *rsa_pubkey_file;
        RSA *rsa_pubkey;
@@ -237,7 +239,7 @@ extern struct server_conf *find_server_conf(const char *name);
 
 extern void attach_server_conf(struct Client *, struct server_conf *);
 extern void detach_server_conf(struct Client *);
-extern void set_server_conf_autoconn(struct Client *source_p, char *name, 
+extern void set_server_conf_autoconn(struct Client *source_p, const char *name, 
                                        int newval);