struct MetaData has an unused member "mimetype" that doesn't

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index 4a6dbc1d278f045e4e8c9f01b28e4790dc1c44b6..85f6c1cfcec353004632b52ef8bc4361a2d5ef62 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-2018 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;
@@ -66,21 +65,22 @@ typedef struct __recptypes {
 #define RECPTYPES_MAGIC 0xfeeb
 
 
-#define CTDLEXIT_SHUTDOWN      0       /* Normal shutdown; do NOT auto-restart */
+#define CTDLEXIT_SHUTDOWN      0       // Normal shutdown; do NOT auto-restart
 
 /*
  * Exit codes 101 through 109 are used for conditions in which
  * we deliberately do NOT want the service to automatically
  * restart.
  */
-#define CTDLEXIT_CONFIG                101     /* Could not read citadel.config */
-#define CTDLEXIT_CONTROL       102     /* Could not acquire lock */
-#define CTDLEXIT_HOME          103     /* Citadel home directory not found */
-#define CTDLEXIT_OOD           104     /* Out Of Date config - rerun setup */
-#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_CONFIG                101     // Could not read system configuration
+#define CTDLEXIT_CONTROL       102     // Could not acquire lock
+#define CTDLEXIT_HOME          103     // Citadel home directory not found
+#define CTDLEXIT_OOD           104     // Out Of Date config - rerun setup
+#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)
@@ -118,6 +118,7 @@ enum {
 
 extern int ScheduledShutdown;
 extern uid_t ctdluid;
+extern int sanity_diag_mode;
 
 struct ExpressMessage {
        struct ExpressMessage *next;
@@ -146,7 +147,6 @@ enum {
        S_SUPPMSGMAIN,
        S_CONFIG,
        S_HOUSEKEEPING,
-       S_NTTLIST,
        S_DIRECTORY,
        S_NETCONFIGS,
        S_PUBLIC_CLIENTS,
@@ -210,7 +210,7 @@ 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 */
 };
@@ -286,7 +286,7 @@ struct MetaData {
        int meta_refcount;              /* Number of rooms pointing to this msg */
        char meta_content_type[64];     /* Cached MIME content-type */
        long meta_rfc822_length;        /* Cache of RFC822-translated msg length */
-       char mimetype[64];              /* if we were able to guess the mimetype for the data */ 
+       char unused_field_1[64];        /* FIXME this isn't used anywhere , why do we have it ?!? */
 };
 
 /* Calls to AdjRefCount() are queued and deferred, so the user doesn't