whittle whittle

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index a34e1e4231ba0b9124eef067c5e802cf51d1521e..ec821d91b941db2c7121a73dccc76c6a5d83c211 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -1,7 +1,7 @@
 /* 
  * Main declarations file for the Citadel server
  *
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2017 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 3.
@@ -54,7 +54,6 @@ typedef struct __recptypes {
        char *errormsg;
        char *recp_local;
        char *recp_internet;
-       char *recp_ignet;
        char *recp_room;
        char *recp_orgroom;
        char *display_recp;
@@ -80,6 +79,8 @@ typedef struct __recptypes {
 #define CTDLEXIT_DB            105     /* Unable to initialize database */
 #define CTDLEXIT_LIBCITADEL    106     /* Incorrect version of libcitadel */
 #define CTDL_EXIT_UNSUP_AUTH   107     /* Unsupported auth mode configured */
+#define CTDLEXIT_UNUSER                108     /* Could not determine uid to run as */
+#define CTDLEXIT_CRYPTO                109     /* Problem initializing SSL or TLS */
 
 /*
  * Reasons why a session would be terminated (set CC->kill_me to these values)
@@ -115,22 +116,8 @@ 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 {
        struct ExpressMessage *next;
@@ -159,7 +146,6 @@ enum {
        S_SUPPMSGMAIN,
        S_CONFIG,
        S_HOUSEKEEPING,
-       S_NTTLIST,
        S_DIRECTORY,
        S_NETCONFIGS,
        S_PUBLIC_CLIENTS,
@@ -223,7 +209,8 @@ enum {
        CDB_FULLTEXT,           /* full text search index        */
        CDB_EUIDINDEX,          /* locate msgs by EUID           */
        CDB_USERSBYNUMBER,      /* index of users by number      */
-       CDB_OPENID,             /* associates OpenIDs with users */
+       CDB_EXTAUTH,            /* associates OpenIDs with users */
+       CDB_CONFIG,             /* system configuration database */
        MAXCDB                  /* total number of CDB's defined */
 };