Put back use_forward.

[solanum.git] / src / ircd.c

diff --git a/src/ircd.c b/src/ircd.c
index add5f65b81403c9f226e24237883aa502e59de0f..dd6eb82c7509da536c6ed3418ce41975ac4fe0e9 100644 (file)
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -324,8 +324,8 @@ initialize_global_set_options(void)
                splitchecking = 1;
        }
 
-       if(ConfigFileEntry.ident_timeout)
-               GlobalSetOptions.ident_timeout = ConfigFileEntry.ident_timeout;
+       if(ConfigFileEntry.default_ident_timeout)
+               GlobalSetOptions.ident_timeout = ConfigFileEntry.default_ident_timeout;
        else
                GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
 
@@ -590,6 +590,9 @@ main(int argc, char *argv[])
        if(printVersion)
        {
                printf("ircd: version %s(%s)\n", ircd_version, serno);
+#ifdef CUSTOM_BRANDING
+               printf("ircd: based on %s-%s\n", PACKAGE_NAME, PACKAGE_VERSION);
+#endif
                printf("ircd: %s\n", rb_lib_version());
                exit(EXIT_SUCCESS);
        }