X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/0eceaff17a0fd935caa086ee43b328b0ea9282a5..8e3b2b85c7221f2f9f1ca6d5e48880d521d2a1a3:/src/s_conf.c

diff --git a/src/s_conf.c b/src/s_conf.c
index 5eb07d5..bbe78c4 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -680,6 +680,7 @@ set_default_conf(void)
 
 	ConfigFileEntry.default_operstring = rb_strdup("is an IRC operator");
 	ConfigFileEntry.default_adminstring = rb_strdup("is a Server Administrator");
+	ConfigFileEntry.default_operhost = rb_strdup("");
 	ConfigFileEntry.servicestring = rb_strdup("is a Network Service");
 
 	ConfigFileEntry.default_umodes = UMODE_INVISIBLE;	
@@ -747,6 +748,7 @@ set_default_conf(void)
 	ConfigFileEntry.oper_snomask = SNO_GENERAL;
 
 	ConfigChannel.autochanmodes = rb_strdup("nt");
+	ConfigChannel.exemptchanops = rb_strdup("");
 	ConfigChannel.use_halfop = YES;
 	ConfigChannel.use_owner = YES;
 	ConfigChannel.use_except = YES;
@@ -772,6 +774,14 @@ set_default_conf(void)
 	ConfigChannel.resv_forcepart = YES;
 	ConfigChannel.kick_no_rejoin_time = 30;
 
+	ConfigChannel.exempt_cmode_c = NO;
+	ConfigChannel.exempt_cmode_C = NO;
+	ConfigChannel.exempt_cmode_D = NO;
+	ConfigChannel.exempt_cmode_T = NO;
+	ConfigChannel.exempt_cmode_N = NO;
+	ConfigChannel.exempt_cmode_G = NO;
+	ConfigChannel.exempt_cmode_K = NO;
+
 	ConfigServerHide.flatten_links = 0;
 	ConfigServerHide.links_delay = 300;
 	ConfigServerHide.hidden = 0;
@@ -788,6 +798,7 @@ set_default_conf(void)
 	ConfigFileEntry.reject_duration = 120;
 	ConfigFileEntry.throttle_count = 4;
 	ConfigFileEntry.throttle_duration = 60;
+	ConfigFileEntry.expire_override_time = 300;
 
 	ServerInfo.default_max_clients = MAXCONNECTIONS;
 
@@ -866,6 +877,52 @@ validate_conf(void)
 		splitmode = 0;
 		splitchecking = 0;
 	}
+
+	if(!valid_hostname(ConfigFileEntry.default_operhost))
+	{
+		conf_report_error("Warning -- invalid default_operhost specified, ignoring.");
+		ConfigFileEntry.default_operhost = rb_strdup("");
+	}
+
+	/* Parse the exemptchanops option and set the internal variables
+	 * that we will use. */
+	char * ech;
+
+	for(ech = ConfigChannel.exemptchanops; *ech; ech++)
+	{
+		if(*ech == 'c')
+		{
+			ConfigChannel.exempt_cmode_c = 1;
+			continue;
+		}
+		if(*ech == 'C')
+		{
+			ConfigChannel.exempt_cmode_C = 1;
+			continue;
+		}
+		if(*ech == 'D')
+		{
+			ConfigChannel.exempt_cmode_D = 1;
+			continue;
+		}
+		if(*ech == 'T')
+		{
+			ConfigChannel.exempt_cmode_T = 1;
+			continue;
+		}
+		if(*ech == 'N')
+		{
+			ConfigChannel.exempt_cmode_N = 1;
+			continue;
+		}
+		if(*ech == 'G')
+		{
+			ConfigChannel.exempt_cmode_G = 1;
+			continue;
+		}
+		if(*ech == 'K')
+			ConfigChannel.exempt_cmode_K = 1;
+	}
 }
 
 /* add_temp_kline()