* Close the fd to our control file.

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index dca5ce0ea02c5e1faf77b00db0ed774b2b67aed4..a4f5e4cd4cbd9d7b8d76de1f348e17ef89f1669b 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -65,7 +65,6 @@ char *unique_session_numbers;
 int ScheduledShutdown = 0;
 int do_defrag = 0;
 time_t server_startup_time;
-char pid_file_name[PATH_MAX];
 
 /*
  * Various things that need to be initialized at startup
@@ -75,19 +74,10 @@ void master_startup(void) {
        unsigned int seed;
        FILE *urandom;
        struct ctdlroom qrbuf;
-       FILE *pidfile_fp;
        
        lprintf(CTDL_DEBUG, "master_startup() started\n");
        time(&server_startup_time);
 
-       /* pid file.  If we go FSSTND this should end up in 'localstatedir' */
-       snprintf(pid_file_name, sizeof pid_file_name, "./citadel.pid");
-       pidfile_fp = fopen(pid_file_name, "w");
-       if (pidfile_fp != NULL) {
-               fprintf(pidfile_fp, "%d\n", (int)getpid());
-               fclose(pidfile_fp);
-       }
-
        lprintf(CTDL_INFO, "Opening databases\n");
        open_databases();
 
@@ -109,27 +99,6 @@ void master_startup(void) {
                 lputroom(&qrbuf);
         }
 
-       /*
-        * Create a room in which we can deposit "deleted" messages for
-        * deferred deletion.  This will silently fail if the room already
-        * exists, and that's perfectly ok, because we want it to exist.
-        */
-       create_room(DELETED_MSGS_ROOM, 3, "", 0, 1, 0, VIEW_MAILBOX);
-
-       /*
-        * Make sure it's set to be a "system room" so it doesn't show up
-        * in the <K>nown rooms list for Aides.  Also set the message expire
-        * policy to "by count, 1 message" so everything gets deleted all
-        * the time (we can't set it to 0 because that's invalid, so we keep
-        * a single message around).
-        */
-       if (lgetroom(&qrbuf, DELETED_MSGS_ROOM) == 0) {
-               qrbuf.QRflags2 |= QR2_SYSTEM;
-               qrbuf.QRep.expire_mode = EXPIRE_NUMMSGS;
-               qrbuf.QRep.expire_value = 1;
-               lputroom(&qrbuf);
-       }
-
        lprintf(CTDL_INFO, "Seeding the pseudo-random number generator...\n");
        urandom = fopen("/dev/urandom", "r");
        if (urandom != NULL) {
@@ -166,6 +135,9 @@ void master_cleanup(int exitcode) {
                (*fcn->h_function_pointer)();
        }
 
+       /* Close the AdjRefCount queue file */
+       AdjRefCount(-1, 0);
+
        /* Shut down the indexer thread */
        lprintf(CTDL_INFO, "Waiting for the indexer thread to shut down\n");
        pthread_join(indexer_thread_tid, NULL);
@@ -193,12 +165,13 @@ void master_cleanup(int exitcode) {
                        sleep(32767);
                }
        }
+       
+       release_control();
 
        /* Now go away. */
        lprintf(CTDL_NOTICE, "citserver: Exiting with status %d\n", exitcode);
        fflush(stdout); fflush(stderr);
-
-       unlink(pid_file_name);
+       
        exit(exitcode);
 }
 
@@ -267,11 +240,14 @@ void cmd_info(void) {
        cprintf("0\n"); /* 1 = no, this server is not LDAP-enabled */
 #endif
 
-#ifdef ENABLE_AUTOLOGIN
-       cprintf("1\n"); /* "create new user" never works with autologin */
-#else
-       cprintf("%d\n", config.c_disable_newu); /* otherwise, site defined */
-#endif
+       if (config.c_auth_mode == 1) {
+               cprintf("1\n"); /* "create new user" never works with host auth */
+       }
+       else {
+               cprintf("%d\n", config.c_disable_newu); /* otherwise, site defined */
+       }
+
+       cprintf("%s\n", config.c_default_cal_zone);
 
        cprintf("000\n");
 }
@@ -364,6 +340,7 @@ int is_public_client(void)
                                if ((strlen(public_clients) +
                                   strlen(addrbuf) + 2)
                                   < sizeof(public_clients)) {
+                                       strcat(public_clients, "|");
                                        strcat(public_clients, addrbuf);
                                }
                        }
@@ -431,7 +408,7 @@ void cmd_iden(char *argbuf)
                lprintf(CTDL_DEBUG, "Looking up hostname '%s'\n", from_host);
                if ((addr.s_addr = inet_addr(from_host)) != -1) {
                        locate_host(CC->cs_host, sizeof CC->cs_host,
-                               NULL, 0,
+                               CC->cs_addr, sizeof CC->cs_addr,
                                &addr);
                }
                else {
@@ -1075,6 +1052,10 @@ void do_command_loop(void) {
                cmd_opna(&cmdbuf[5]);
        }
 
+       else if (!strncasecmp(cmdbuf,"DLAT",4)) {
+               cmd_dlat(&cmdbuf[5]);
+       }
+
        else if (!strncasecmp(cmdbuf,"INFO",4)) {
                cmd_info();
        }