* More work on OpenID 1.1 Relying Party support

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index a0d7b31f742a0ed1a19d52d7bd18fdd35a8b3d64..be547e12ee85a36a7152f5004cc816c624368725 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -54,6 +54,7 @@
 #include "database.h"
 #include "user_ops.h"
 #include "housekeeping.h"
+#include "svn_revision.h"
 #include "citadel_dirs.c"
 
 #include "modules_init.h"
@@ -70,8 +71,10 @@ const char *CitadelServiceUDS="citadel-UDS";
 const char *CitadelServiceTCP="citadel-TCP";
 
 
-void go_threading(void);
+extern struct CitContext masterCC;
+
 
+void go_threading(void);
 
 /*
  * Here's where it all begins.
@@ -99,7 +102,6 @@ int main(int argc, char **argv)
        /* initialise semaphores here. Patch by Matt and davew
         * its called here as they are needed by CtdlLogPrintf for thread safety
         */
-       CtdlInitBase64Table();
        InitialiseSemaphores();
        
        /* initialize the master context */
@@ -139,10 +141,6 @@ int main(int argc, char **argv)
                        freopen(&argv[a][2], "w", stderr);
                }
 
-               else if (!strncmp(argv[a], "-f", 2)) {
-                       do_defrag = 1;
-               }
-
                else if (!strncmp(argv[a], "-D", 2)) {
                        dbg = 1;
                }
@@ -158,7 +156,7 @@ int main(int argc, char **argv)
                        CtdlLogPrintf(CTDL_EMERG,       "citserver: usage: "
                                        "citserver "
                                        "[-lLogFacility] "
-                                       "[-d] [-f] [-D] "
+                                       "[-d] [-D] "
                                        " [-tTraceFile]"
                                        " [-xLogLevel] [-hHomeDir]\n");
                        exit(1);
@@ -181,19 +179,14 @@ int main(int argc, char **argv)
        params.debugLevel = ECRASH_DEBUG_VERBOSE;
        params.dumpAllThreads = TRUE;
        params.useBacktraceSymbols = 1;
-///    BuildSymbolTable(&symbol_table);
-//     params.symbolTable = &symbol_table;
        params.signals[0]=SIGSEGV;
        params.signals[1]=SIGILL;
        params.signals[2]=SIGBUS;
        params.signals[3]=SIGABRT;
-
        eCrash_Init(&params);
-               
        eCrash_RegisterThread("MasterThread", 0);
-
-///    signal(SIGSEGV, cit_panic_backtrace);
 #endif
+
        /* Initialize the syslogger.  Yes, we are really using 0 as the
         * facility, because we are going to bitwise-OR the facility to
         * the severity of each message, allowing us to write to other
@@ -208,13 +201,11 @@ int main(int argc, char **argv)
        CtdlLogPrintf(CTDL_NOTICE, "\n");
        CtdlLogPrintf(CTDL_NOTICE, "\n");
        CtdlLogPrintf(CTDL_NOTICE,
-               "*** Citadel server engine v%d.%02d ***\n",
-               (REV_LEVEL/100), (REV_LEVEL%100));
-       CtdlLogPrintf(CTDL_NOTICE,
-               "Copyright (C) 1987-2008 by the Citadel development team.\n");
-       CtdlLogPrintf(CTDL_NOTICE,
-               "This program is distributed under the terms of the GNU "
-               "General Public License.\n");
+               "*** Citadel server engine v%d.%02d (build %s) ***\n",
+               (REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
+       CtdlLogPrintf(CTDL_NOTICE, "Copyright (C) 1987-2008 by the Citadel development team.\n");
+       CtdlLogPrintf(CTDL_NOTICE, "This program is distributed under the terms of the GNU "
+                                       "General Public License.\n");
        CtdlLogPrintf(CTDL_NOTICE, "\n");
        CtdlLogPrintf(CTDL_DEBUG, "Called as: %s\n", argv[0]);
        CtdlLogPrintf(CTDL_INFO, "%s\n", libcitadel_version_string());
@@ -223,17 +214,25 @@ int main(int argc, char **argv)
        CtdlLogPrintf(CTDL_INFO, "Loading citadel.config\n");
        get_config();
        config.c_ipgm_secret = rand();
+
+       CtdlLogPrintf(CTDL_INFO, "Acquiring control record\n");
+       get_control();
+
        put_config();
 
 #ifdef HAVE_RUN_DIR
        /* on some dists rundir gets purged on startup. so we need to recreate it. */
 
        if (stat(ctdl_run_dir, &filestats)==-1){
+#ifdef HAVE_GETPWUID_R
 #ifdef SOLARIS_GETPWUID
                pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
-#else
+#else // SOLARIS_GETPWUID
                getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
-#endif
+#endif // SOLARIS_GETPWUID
+#else // HAVE_GETPWUID_R
+               pwp = NULL;
+#endif // HAVE_GETPWUID_R
                mkdir(ctdl_run_dir, 0755);
                chown(ctdl_run_dir, config.c_ctdluid, (pwp==NULL)?-1:pw.pw_gid);
        }
@@ -249,9 +248,20 @@ int main(int argc, char **argv)
         */
        master_startup();
 
-       CtdlLogPrintf(CTDL_INFO, "Acquiring control record\n");
-       get_control();
-
+       
+/*
+ * Initialise the user 0 to have a name. It would be nice to do it in InitializeMasterCC
+ * since it is contained within the MasterCC but we can't because the DB isn't available
+ * at that time so we do it seperate.
+ */
+       /** Give user 0 a name and create them if necessary */
+       if (getuser(&masterCC.user, "Citadel"))
+       {
+               getuserbynumber(&masterCC.user, 0);
+               strcpy (masterCC.user.fullname, "Citadel");
+               putuser(&masterCC.user);
+       }
+       
        /*
         * Bind the server to a Unix-domain socket.
         */
@@ -293,7 +303,7 @@ int main(int argc, char **argv)
        /*
         * If we need host auth, start our chkpwd daemon.
         */
-       if (config.c_auth_mode == 1) {
+       if (config.c_auth_mode == AUTHMODE_HOST) {
                start_chkpwd_daemon();
        }
 
@@ -304,11 +314,16 @@ int main(int argc, char **argv)
        if (drop_root_perms) {
                cdb_chmod_data();       /* make sure we own our data files */
 
+#ifdef HAVE_GETPWUID_R
 #ifdef SOLARIS_GETPWUID
                pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
-#else
+#else // SOLARIS_GETPWUID
                getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
-#endif
+#endif // SOLARIS_GETPWUID
+#else // HAVE_GETPWUID_R
+               pwp = NULL;
+#endif // HAVE_GETPWUID_R
+
                if (pwp == NULL)
                        CtdlLogPrintf(CTDL_CRIT, "WARNING: getpwuid(%ld): %s\n"
                                   "Group IDs will be incorrect.\n", (long)CTDLUID,