X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/d7f753cd3aad6e997b9da85f6973890501496ea1..4f5ec033bc32ec109bdbc7d97b1f7397f994eeba:/src/newconf.c

diff --git a/src/newconf.c b/src/newconf.c
index 9bb3c1f..6f1c5f1 100644
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -307,7 +307,7 @@ static struct mode_table umode_table[] = {
 	{NULL, 0}
 };
 
-static struct mode_table flag_table[] = {
+static struct mode_table oper_table[] = {
 	{"encrypted",		OPER_ENCRYPTED		},
 	{"local_kill",		OPER_LOCKILL		},
 	{"global_kill",		OPER_GLOBKILL|OPER_LOCKILL	},
@@ -321,10 +321,12 @@ static struct mode_table flag_table[] = {
 	{"admin",		OPER_ADMIN		},
 	{"hidden_admin",	OPER_HADMIN		},
 	{"xline",		OPER_XLINE		},
+	{"resv",		OPER_RESV		},
 	{"operwall",		OPER_OPERWALL		},
 	{"oper_spy",		OPER_SPY		},
 	{"hidden_oper",		OPER_INVIS		},
 	{"remoteban",		OPER_REMOTEBAN		},
+	{"mass_notice",		OPER_MASSNOTICE		},
 	{NULL, 0}
 };
 
@@ -465,7 +467,7 @@ conf_begin_oper(struct TopConf *tc)
 	}
 
 	yy_oper = make_oper_conf();
-	yy_oper->flags |= OPER_ENCRYPTED|OPER_OPERWALL|OPER_REMOTEBAN;
+	yy_oper->flags |= OPER_ENCRYPTED|OPER_RESV|OPER_OPERWALL|OPER_REMOTEBAN|OPER_MASSNOTICE;
 
 	return 0;
 }
@@ -536,7 +538,7 @@ conf_end_oper(struct TopConf *tc)
 			yy_tmpoper->rsa_pubkey =
 				(RSA *) PEM_read_bio_RSA_PUBKEY(file, NULL, 0, NULL);
 
-			BIO_set_close(file, BIO_CLOSE);
+			(void)BIO_set_close(file, BIO_CLOSE);
 			BIO_free(file);
 
 			if(yy_tmpoper->rsa_pubkey == NULL)
@@ -564,7 +566,7 @@ conf_set_oper_flags(void *data)
 {
 	conf_parm_t *args = data;
 
-	set_modes_from_table(&yy_oper->flags, "flag", flag_table, args);
+	set_modes_from_table(&yy_oper->flags, "flag", oper_table, args);
 }
 
 static void
@@ -2010,7 +2012,6 @@ static struct ConfEntry conf_general_table[] =
 	{ "connect_timeout",	CF_TIME,  NULL, 0, &ConfigFileEntry.connect_timeout	},
 	{ "default_floodcount", CF_INT,   NULL, 0, &ConfigFileEntry.default_floodcount	},
 	{ "disable_auth",	CF_YESNO, NULL, 0, &ConfigFileEntry.disable_auth	},
-	{ "dot_in_ip6_addr",	CF_YESNO, NULL, 0, &ConfigFileEntry.dot_in_ip6_addr	},
 	{ "dots_in_ident",	CF_INT,   NULL, 0, &ConfigFileEntry.dots_in_ident	},
 	{ "failed_oper_notice",	CF_YESNO, NULL, 0, &ConfigFileEntry.failed_oper_notice	},
 	{ "glines",		CF_YESNO, NULL, 0, &ConfigFileEntry.glines		},
@@ -2018,7 +2019,6 @@ static struct ConfEntry conf_general_table[] =
 	{ "gline_min_cidr6",	CF_INT,   NULL, 0, &ConfigFileEntry.gline_min_cidr6	},
 	{ "gline_time",		CF_TIME,  NULL, 0, &ConfigFileEntry.gline_time		},
 	{ "global_snotices",	CF_YESNO, NULL, 0, &ConfigFileEntry.global_snotices	},
-	{ "idletime",		CF_TIME,  NULL, 0, &ConfigFileEntry.idletime		},
 	{ "hide_spoof_ips",	CF_YESNO, NULL, 0, &ConfigFileEntry.hide_spoof_ips	},
 	{ "dline_with_reason",	CF_YESNO, NULL, 0, &ConfigFileEntry.dline_with_reason	},
 	{ "kline_with_reason",	CF_YESNO, NULL, 0, &ConfigFileEntry.kline_with_reason	},