Begin removing the decimal point from our version number (901 instead of 9.01)

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index bcb55cb7044bcedb40ed1f6faec2420f6a4ad55a..45312588ee614e90f17c836fd2b05e95f7c5578c 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -1,7 +1,7 @@
 /*
  * citserver's main() function lives here.
  * 
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2016 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -29,6 +29,9 @@
 uid_t ctdluid = 0;
 const char *CitadelServiceUDS="citadel-UDS";
 const char *CitadelServiceTCP="citadel-TCP";
+
+
+
 void go_threading(void);
 
 /*
@@ -192,10 +195,9 @@ int main(int argc, char **argv)
        /* Tell 'em who's in da house */
        syslog(LOG_NOTICE, " ");
        syslog(LOG_NOTICE, " ");
-       syslog(LOG_NOTICE,
-               "*** Citadel server engine v%d.%02d (build %s) ***",
-               (REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
-       syslog(LOG_NOTICE, "Copyright (C) 1987-2015 by the Citadel development team.");
+       syslog(LOG_NOTICE, "*** Citadel server engine ***\n");
+       syslog(LOG_NOTICE, "Version %d (build %s) ***", REV_LEVEL, svn_revision());
+       syslog(LOG_NOTICE, "Copyright (C) 1987-2016 by the Citadel development team.");
        syslog(LOG_NOTICE, "This program is distributed under the terms of the GNU "
                                        "General Public License.");
        syslog(LOG_NOTICE, " ");
@@ -284,7 +286,7 @@ int main(int argc, char **argv)
        /*
         * Bind the server to our favorite TCP port (usually 504).
         */
-       CtdlRegisterServiceHook(config.c_port_number,
+       CtdlRegisterServiceHook(CtdlGetConfigInt("c_port_number"),
                                NULL,
                                citproto_begin_session,
                                do_command_loop,
@@ -307,7 +309,7 @@ int main(int argc, char **argv)
        /*
         * If we need host auth, start our chkpwd daemon.
         */
-       if (config.c_auth_mode == AUTHMODE_HOST) {
+       if (CtdlGetConfigInt("c_auth_mode") == AUTHMODE_HOST) {
                start_chkpwd_daemon();
        }