Add is_halfop() and is_owner() and start using them in the new functions.

[irc/rqf/shadowircd.git] / src / s_conf.c

diff --git a/src/s_conf.c b/src/s_conf.c
index daeb74b0c54076308f5dd5de7f50ccc53d78c8b1..a90b1c6d6f677424391c75c13fa423d0d6701929 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -635,23 +635,6 @@ rehash(int sig)
        return (0);
 }
 
-static struct banconf_entry
-{
-       const char **filename;
-       void (*func) (FILE *);
-       int perm;
-} banconfs[] = {
-       { &ConfigFileEntry.klinefile,   parse_k_file,   0 },
-       { &ConfigFileEntry.klinefile,   parse_k_file,   1 },
-       { &ConfigFileEntry.dlinefile,   parse_d_file,   0 },
-       { &ConfigFileEntry.dlinefile,   parse_d_file,   1 },
-       { &ConfigFileEntry.xlinefile,   parse_x_file,   0 },
-       { &ConfigFileEntry.xlinefile,   parse_x_file,   1 },
-       { &ConfigFileEntry.resvfile,    parse_resv_file,0 },
-       { &ConfigFileEntry.resvfile,    parse_resv_file,1 },
-       { NULL,                         NULL,           0 }
-};
-
 void
 rehash_bans(int sig)
 {
@@ -752,6 +735,7 @@ set_default_conf(void)
        ConfigFileEntry.collision_fnc = YES;
        ConfigFileEntry.global_snotices = YES;
        ConfigFileEntry.operspy_dont_care_user_info = NO;
+       ConfigFileEntry.secret_channels_in_whois = NO;
 
 #ifdef HAVE_LIBZ
        ConfigFileEntry.compression_level = 4;
@@ -762,6 +746,9 @@ set_default_conf(void)
        ConfigFileEntry.oper_only_umodes = UMODE_SERVNOTICE;
        ConfigFileEntry.oper_snomask = SNO_GENERAL;
 
+       ConfigChannel.autochanmodes = rb_strdup("nt");
+       ConfigChannel.use_halfop = YES;
+       ConfigChannel.use_owner = YES;
        ConfigChannel.use_except = YES;
        ConfigChannel.use_invex = YES;
        ConfigChannel.use_knock = YES;
@@ -772,6 +759,8 @@ set_default_conf(void)
        ConfigChannel.max_bans = 25;
        ConfigChannel.max_bans_large = 500;
        ConfigChannel.only_ascii_channels = NO;
+       ConfigChannel.cycle_host_change = YES;
+       ConfigChannel.host_in_topic = YES;
        ConfigChannel.burst_topicwho = NO;
        ConfigChannel.kick_on_split_riding = NO;
 
@@ -780,6 +769,7 @@ set_default_conf(void)
        ConfigChannel.no_join_on_split = NO;
        ConfigChannel.no_create_on_split = YES;
        ConfigChannel.resv_forcepart = YES;
+       ConfigChannel.kick_no_rejoin_time = 30;
 
        ConfigServerHide.flatten_links = 0;
        ConfigServerHide.links_delay = 300;