A few more fixes. Part 3 of 2 I suppose.

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

diff --git a/src/newconf.c b/src/newconf.c
index 18ea7fca7378ea985c90f8c888eb0489cc7f641b..d77d095775f81fb13b1f81a6b1a115e825a61a53 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -1,5 +1,4 @@
 /* This code is in the public domain.
- * $Id: newconf.c 3550 2007-08-09 06:47:26Z nenolod $
  */
 
 #include "stdinc.h"
@@ -1077,7 +1076,7 @@ static void
 conf_set_auth_autojoin_opers(void *data)
 {
        if(yy_aconf->autojoin_opers)
-               memset(yy_aconf->autojoin_opers, 0, strlen(yy_aconf->autojoin));
+               memset(yy_aconf->autojoin_opers, 0, strlen(yy_aconf->autojoin_opers));
        rb_free(yy_aconf->autojoin_opers);
        yy_aconf->autojoin_opers = rb_strdup(data);
 }
@@ -1933,7 +1932,7 @@ conf_call_set(struct TopConf *tc, char *item, conf_parm_t * value, int type)
 
        /* if it takes one thing, make sure they only passed one thing,
           and handle as needed. */
-       if(value->type & CF_FLIST && !cf->cf_type & CF_FLIST)
+       if(value->type & CF_FLIST && !(cf->cf_type & CF_FLIST))
        {
                conf_report_error
                        ("Option %s::%s does not take a list of values.", tc->tc_name, item);
@@ -2021,7 +2020,7 @@ add_conf_item(const char *topconf, const char *name, int type, void (*func) (voi
        if((tc = find_top_conf(topconf)) == NULL)
                return -1;
 
-       if((cf = find_conf_item(tc, name)) != NULL)
+       if(find_conf_item(tc, name))
                return -1;
 
        cf = rb_malloc(sizeof(struct ConfEntry));
@@ -2063,6 +2062,8 @@ static struct ConfEntry conf_serverinfo_table[] =
 {
        { "description",        CF_QSTRING, NULL, 0, &ServerInfo.description    },
        { "network_desc",       CF_QSTRING, NULL, 0, &ServerInfo.network_desc   },
+       { "helpchan",           CF_QSTRING, NULL, 0, &ServerInfo.helpchan               },
+       { "helpurl",            CF_QSTRING, NULL, 0, &ServerInfo.helpurl                },
        { "hub",                CF_YESNO,   NULL, 0, &ServerInfo.hub            },
 
        { "network_name",       CF_QSTRING, conf_set_serverinfo_network_name,   0, NULL },
@@ -2200,6 +2201,7 @@ static struct ConfEntry conf_general_table[] =
        { "anti_spam_exit_message_time", CF_TIME,  NULL, 0, &ConfigFileEntry.anti_spam_exit_message_time },
        { "use_part_messages",          CF_YESNO, NULL, 0, &ConfigFileEntry.use_part_messages   },
        { "disable_fake_channels",       CF_YESNO, NULL, 0, &ConfigFileEntry.disable_fake_channels },
+       { "hide_channel_below_users", CF_INT, NULL, 0, &ConfigFileEntry.hide_channel_below_users },
        { "min_nonwildcard_simple",      CF_INT,   NULL, 0, &ConfigFileEntry.min_nonwildcard_simple },
        { "non_redundant_klines",        CF_YESNO, NULL, 0, &ConfigFileEntry.non_redundant_klines },
        { "tkline_expire_notices",       CF_YESNO, NULL, 0, &ConfigFileEntry.tkline_expire_notices },
@@ -2212,6 +2214,7 @@ static struct ConfEntry conf_general_table[] =
        { "collision_fnc",      CF_YESNO, NULL, 0, &ConfigFileEntry.collision_fnc       },
        { "connect_timeout",    CF_TIME,  NULL, 0, &ConfigFileEntry.connect_timeout     },
        { "default_floodcount", CF_INT,   NULL, 0, &ConfigFileEntry.default_floodcount  },
+       { "default_ident_timeout",      CF_INT, NULL, 0, &ConfigFileEntry.default_ident_timeout         },
        { "disable_auth",       CF_YESNO, NULL, 0, &ConfigFileEntry.disable_auth        },
        { "dots_in_ident",      CF_INT,   NULL, 0, &ConfigFileEntry.dots_in_ident       },
        { "failed_oper_notice", CF_YESNO, NULL, 0, &ConfigFileEntry.failed_oper_notice  },
@@ -2253,6 +2256,7 @@ static struct ConfEntry conf_general_table[] =
        { "ts_warn_delta",      CF_TIME,  NULL, 0, &ConfigFileEntry.ts_warn_delta       },
        { "use_whois_actually", CF_YESNO, NULL, 0, &ConfigFileEntry.use_whois_actually  },
        { "warn_no_nline",      CF_YESNO, NULL, 0, &ConfigFileEntry.warn_no_nline       },
+       { "use_propagated_bans",CF_YESNO, NULL, 0, &ConfigFileEntry.use_propagated_bans },
        { "expire_override_time",       CF_TIME, NULL, 0, &ConfigFileEntry.expire_override_time},
        { "\0",                 0,        NULL, 0, NULL }
 };
@@ -2261,6 +2265,7 @@ static struct ConfEntry conf_channel_table[] =
 {
        { "autochanmodes",      CF_QSTRING, NULL, 0, &ConfigChannel.autochanmodes       },
        { "exemptchanops",      CF_QSTRING, NULL, 0, &ConfigChannel.exemptchanops       },
+       { "disabledmodes",      CF_QSTRING, NULL, 0, &ConfigChannel.disabledmodes       },
        { "default_split_user_count",   CF_INT,  NULL, 0, &ConfigChannel.default_split_user_count        },
        { "default_split_server_count", CF_INT,  NULL, 0, &ConfigChannel.default_split_server_count },
        { "burst_topicwho",     CF_YESNO, NULL, 0, &ConfigChannel.burst_topicwho        },
@@ -2275,6 +2280,7 @@ static struct ConfEntry conf_channel_table[] =
        { "only_ascii_channels", CF_YESNO, NULL, 0, &ConfigChannel.only_ascii_channels },
        { "cycle_host_change",  CF_YESNO, NULL, 0, &ConfigChannel.cycle_host_change },
        { "host_in_topic",      CF_YESNO, NULL, 0, &ConfigChannel.host_in_topic },
+       { "admin_on_channel_create", CF_YESNO, NULL, 0, &ConfigChannel.admin_on_channel_create },
        { "use_halfop",         CF_YESNO, NULL, 0, &ConfigChannel.use_halfop            },
        { "use_admin",          CF_YESNO, NULL, 0, &ConfigChannel.use_admin             },
        { "use_except",         CF_YESNO, NULL, 0, &ConfigChannel.use_except            },
@@ -2283,7 +2289,7 @@ static struct ConfEntry conf_channel_table[] =
        { "use_forward",        CF_YESNO, NULL, 0, &ConfigChannel.use_forward           },
        { "use_local_channels", CF_YESNO, NULL, 0, &ConfigChannel.use_local_channels    },
        { "resv_forcepart",     CF_YESNO, NULL, 0, &ConfigChannel.resv_forcepart        },
-       { "kick_no_rejoin_time", CF_TIME,  NULL, 0, &ConfigChannel.kick_no_rejoin_time  },
+       { "channel_target_change", CF_YESNO, NULL, 0, &ConfigChannel.channel_target_change  },
        { "exempt_cmode_c",     CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_c        },
        { "exempt_cmode_C",     CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_C        },
        { "exempt_cmode_D",     CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_D        },