Do not allow a topic change if a user may not send to the channel

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

diff --git a/src/s_conf.c b/src/s_conf.c
index c1d623475f35a92739fc5624d610ce4e54d145b7..b03a1305e2d94463f3a4a40796bad09f3f89c6a3 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -806,6 +806,7 @@ set_default_conf(void)
        ConfigFileEntry.min_nonwildcard = 4;
        ConfigFileEntry.min_nonwildcard_simple = 3;
        ConfigFileEntry.default_floodcount = 8;
+       ConfigFileEntry.default_ident_timeout = 5;
        ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
        ConfigFileEntry.tkline_expire_notices = 0;
 
@@ -894,7 +895,7 @@ validate_conf(void)
                splitchecking = 0;
        }
 
-       if(!valid_hostname(ConfigFileEntry.default_operhost))
+       if(!valid_hostname(ConfigFileEntry.default_operhost) && !EmptyString(ConfigFileEntry.default_operhost))
        {
                conf_report_error("Warning -- invalid default_operhost specified, ignoring.");
                ConfigFileEntry.default_operhost = rb_strdup("");