Removed the global variable 'home_specified'

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 4bf86ee85868610646b1871687344da29dd8b67c..2d7d65717a974bad19c388725350bcab7889e404 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -71,6 +71,9 @@ const char *CitadelServiceUDS="citadel-UDS";
 const char *CitadelServiceTCP="citadel-TCP";
 
 
+extern struct CitContext masterCC;
+
+
 void go_threading(void);
 
 /*
@@ -130,7 +133,6 @@ int main(int argc, char **argv)
                        else
                                safestrncpy(relhome, &argv[a][2],
                                                        sizeof relhome);
-                       home_specified = 1;
                        home=1;
                }
 
@@ -211,6 +213,11 @@ int main(int argc, char **argv)
        CtdlLogPrintf(CTDL_INFO, "Loading citadel.config\n");
        get_config();
        config.c_ipgm_secret = rand();
+
+       /* get_control() MUST MUST MUST be called BEFORE the databases are opened!! */
+       CtdlLogPrintf(CTDL_INFO, "Acquiring control record\n");
+       get_control();
+
        put_config();
 
 #ifdef HAVE_RUN_DIR
@@ -241,9 +248,28 @@ int main(int argc, char **argv)
         */
        master_startup();
 
-       CtdlLogPrintf(CTDL_INFO, "Acquiring control record\n");
-       get_control();
-
+       /*
+        * Check that the control record is correct and place sensible values if it isn't
+        */
+       check_control();
+       
+       /*
+        * Run any upgrade entry points
+        */
+       CtdlLogPrintf(CTDL_INFO, "Upgrading modules.\n");
+       upgrade_modules();
+       
+/**
+ * Load the user for the masterCC or create them if they don't exist
+ */
+       if (getuser(&masterCC.user, "SYS_Citadel"))
+       {
+               /** User doesn't exist. We can't use create user here as the user number needs to be 0 */
+               strcpy (masterCC.user.fullname, "SYS_Citadel") ;
+               putuser(&masterCC.user);
+               getuser(&masterCC.user, "SYS_Citadel"); /** Just to be safe */
+       }
+       
        /*
         * Bind the server to a Unix-domain socket.
         */
@@ -265,11 +291,6 @@ int main(int argc, char **argv)
                                CitadelServiceTCP);
 
                                
-       /*
-        * Run any upgrade entry points
-        */
-       CtdlLogPrintf(CTDL_INFO, "Upgrading modules.\n");
-       upgrade_modules();
        
        
        /*