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 df662d8db912be75bb994e971c85dd962f9d2730..d77d095775f81fb13b1f81a6b1a115e825a61a53 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -1932,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);
@@ -2020,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));
@@ -2265,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        },
@@ -2279,13 +2280,16 @@ 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            },
        { "use_invex",          CF_YESNO, NULL, 0, &ConfigChannel.use_invex             },
        { "use_knock",          CF_YESNO, NULL, 0, &ConfigChannel.use_knock             },
+       { "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        },
+       { "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        },