Wait longer (30 seconds instead of 10) to connect to Citadel server when running...

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index 45e0d74983a4839b22b35bafc47d1b7c87050f19..4a6dbc1d278f045e4e8c9f01b28e4790dc1c44b6 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -116,22 +116,7 @@ enum {
 #define CS_POSTING     4       /* Posting */
 
 
-/*
- * This is the control record for the message base... 
- */
-struct CitControl {
-       long MMhighest;                 /* highest message number in file   */
-       unsigned MMflags;               /* Global system flags              */
-       long MMnextuser;                /* highest user number on system    */
-       long MMnextroom;                /* highest room number on system    */
-       int MM_hosted_upgrade_level;    /* Server-hosted upgrade level      */
-       int MM_fulltext_wordbreaker;    /* ID of wordbreaker in use         */
-       long MMfulltext;                /* highest message number indexed   */
-       int MMdbversion;                /* Version of Berkeley DB used on previous server run */
-};
-
 extern int ScheduledShutdown;
-extern struct CitControl CitControl;
 extern uid_t ctdluid;
 
 struct ExpressMessage {
@@ -226,6 +211,7 @@ enum {
        CDB_EUIDINDEX,          /* locate msgs by EUID           */
        CDB_USERSBYNUMBER,      /* index of users by number      */
        CDB_OPENID,             /* associates OpenIDs with users */
+       CDB_CONFIG,             /* system configuration database */
        MAXCDB                  /* total number of CDB's defined */
 };