X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/3002877654f452935d230aa28d1b10f27e0d1648..5ac470475dcd506bcb606091c8cfb1d30e7e06b8:/include/s_newconf.h

diff --git a/include/s_newconf.h b/include/s_newconf.h
index bee3df7..dde364d 100644
--- a/include/s_newconf.h
+++ b/include/s_newconf.h
@@ -29,7 +29,6 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: s_newconf.h 1747 2006-07-25 21:22:45Z jilles $
  */
 
 #ifndef INCLUDED_s_newconf_h
@@ -96,10 +95,12 @@ struct remote_conf
 #define SHARED_TDLINE	0x0800
 #define SHARED_PDLINE	0x1000
 #define SHARED_UNDLINE	0x2000
+#define SHARED_DIE      0x4000
+#define SHARED_MODULE	0x8000
 
 #define SHARED_ALL	(SHARED_TKLINE | SHARED_PKLINE | SHARED_UNKLINE |\
 			SHARED_PXLINE | SHARED_TXLINE | SHARED_UNXLINE |\
-			SHARED_TRESV | SHARED_PRESV | SHARED_UNRESV)
+			SHARED_TRESV | SHARED_PRESV | SHARED_UNRESV | SHARED_REHASH)
 #define CLUSTER_ALL	(SHARED_ALL | SHARED_LOCOPS)
 
 /* flags used in hub/leaf */
@@ -112,12 +113,17 @@ struct oper_conf
 	char *username;
 	char *host;
 	char *passwd;
+	char *certfp;
 
 	int flags;
 	int umodes;
 
 	unsigned int snomask;
 
+	char *vhost;
+	char *swhois;
+	char *operstring;
+
 	struct PrivilegeSet *privset;
 
 #ifdef HAVE_LIBCRYPTO
@@ -161,6 +167,7 @@ extern void cluster_generic(struct Client *, const char *, int cltype,
 #define IsOperAdmin(x)          (HasPrivilege((x), "oper:admin") || HasPrivilege((x), "oper:hidden_admin"))
 #define IsOperOperwall(x)       (HasPrivilege((x), "oper:operwall"))
 #define IsOperSpy(x)            (HasPrivilege((x), "oper:spy"))
+#define IsOperOverride(x)       (HasPrivilege((x), "oper:override"))
 #define IsOperInvis(x)          (HasPrivilege((x), "oper:hidden"))
 #define IsOperRemoteBan(x)	(HasPrivilege((x), "oper:remoteban"))
 #define IsOperMassNotice(x)	(HasPrivilege((x), "oper:mass_notice"))
@@ -180,6 +187,7 @@ struct server_conf
 	char *host;
 	char *passwd;
 	char *spasswd;
+	char *certfp;
 	int port;
 	int flags;
 	int servers;