Fixed the bug that prevented DOWN from working properly.

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index b3d110cd8b498b4631621fb143eb0989b65d390d..5d73d7a523ceb3899839e031bafb80e8c653365f 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -55,7 +55,9 @@
 #include "user_ops.h"
 #include "housekeeping.h"
 #include "svn_revision.h"
-#include "citadel_dirs.c"
+#include "citadel_dirs.h"
+
+#include "context.h"
 
 #include "modules_init.h"
 #include "ecrash.h"
@@ -71,8 +73,6 @@ const char *CitadelServiceUDS="citadel-UDS";
 const char *CitadelServiceTCP="citadel-TCP";
 
 
-extern struct CitContext masterCC;
-
 
 void go_threading(void);
 
@@ -262,12 +262,12 @@ int main(int argc, char **argv)
 /**
  * Load the user for the masterCC or create them if they don't exist
  */
-       if (getuser(&masterCC.user, "SYS_Citadel"))
+       if (CtdlGetUser(&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 */
+               CtdlPutUser(&masterCC.user);
+               CtdlGetUser(&masterCC.user, "SYS_Citadel"); /** Just to be safe */
        }
        
        /*