Fix VERSION and RPL_MYINFO to only show modes that are enabled. Also fix up some...

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

diff --git a/src/ircd.c b/src/ircd.c
index a9f6cfbd1ef4cf2446d609b78f4d6051da981746..8716b3e99a5a59635b0418a3244f4c4774f59f19 100644 (file)
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -324,7 +324,17 @@ initialize_global_set_options(void)
                splitchecking = 1;
        }
 
-       GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
+       if(ConfigFileEntry.default_ident_timeout)
+               GlobalSetOptions.ident_timeout = ConfigFileEntry.default_ident_timeout;
+       else
+               GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
+
+       if(ConfigFileEntry.default_operhost)
+               rb_strlcpy(GlobalSetOptions.operhost,
+                       ConfigFileEntry.default_operhost,
+                       sizeof(GlobalSetOptions.operhost));
+       else
+               rb_strlcpy(GlobalSetOptions.operhost, "", sizeof(GlobalSetOptions.operhost));
 
        rb_strlcpy(GlobalSetOptions.operstring,
                ConfigFileEntry.default_operstring,