Release version 992 generated by do-release.sh

[citadel.git] / citadel / server / citadel_defs.h

diff --git a/citadel/server/citadel_defs.h b/citadel/server/citadel_defs.h
index ff890bcaf267aecfc52a02dd073f9ca4e6661b17..c1a0c2c284250fb4293401956afe4edf238566dc 100644 (file)
--- a/citadel/server/citadel_defs.h
+++ b/citadel/server/citadel_defs.h
@@ -11,8 +11,8 @@
 
 // Suppress these compiler warnings
 #pragma GCC diagnostic ignored "-Wcast-qual"
-#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
-#pragma GCC diagnostic ignored "-Wformat-truncation"
+#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"                // this doesn't work on FreeBSD
+#pragma GCC diagnostic ignored "-Wformat-truncation"           // nor does this
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
 #include "sysdep.h"
@@ -21,13 +21,13 @@
 #include "typesize.h"
 #include "ipcdef.h"
 
-#define REV_LEVEL 972          // This version
+#define REV_LEVEL 992          // This version
 #define REV_MIN                591     // Oldest compatible database
 #define EXPORT_REV_MIN 931     // Oldest compatible export files
 #define LIBCITADEL_MIN 951     // Minimum required version of libcitadel
 #define SERVER_TYPE    0       // zero for stock Citadel; other developers please obtain SERVER_TYPE codes for your implementations
 
-#define TRACE  syslog(LOG_DEBUG, "\033[7m  Checkpoint: %s : %d  \033[0m", __FILE__, __LINE__)
+#define TRACE  syslog(LOG_DEBUG, "\033[7m  Checkpoint: %p : %s : %d  \033[0m", CC, __FILE__, __LINE__)
 
 #ifndef LONG_MAX
 #define LONG_MAX 2147483647L
@@ -87,22 +87,28 @@
 #define EXPIRE_NUMMSGS         2       // Keep only latest n messages
 #define EXPIRE_AGE             3       // Expire messages after n days
 
-#define RECPTYPES_MAGIC 0xfeeb
+#define RECPTYPES_MAGIC                0xfeeb
 
 #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.
+// Exit codes 101-109  are used for conditions in which we
+// deliberately do NOT want the service to automatically restart.
 #define CTDLEXIT_CONFIG                101     // Could not read system configuration
+#define CTDLEXIT_SANITY                102     // Internal sanity check failed
 #define CTDLEXIT_HOME          103     // Citadel home directory not found
 #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
-// Any other exit is likely to be from an unexpected abort (segfault etc)
-// and we want to try restarting.
+
+// Other exit codes are probably ok to try starting the server again.
+#define CTDLEXIT_REDIRECT      110     // Redirect buffer failure
+#define CTDLEXIT_CHKPWD                111     // chkpwd daemon failed
+#define CTDLEXIT_THREAD                112     // Problem setting up multithreading
+#define CTDLEXIT_BAD_MAGIC     113     // internet_addressing() magic number is wrong
+
+// Any other exit is likely to be from an unexpected abort (segfault etc) and we want to try restarting.
 
 
 // Reasons why a session would be terminated (set CC->kill_me to these values)
@@ -164,6 +170,7 @@ enum {
        S_IM_LOGS,
        S_OPENSSL,
        S_SMTPQUEUE,
+       S_INDEXER,
        MAX_SEMAPHORES
 };
 
@@ -198,7 +205,7 @@ enum {
        CDB_FULLTEXT,           // full text search index
        CDB_EUIDINDEX,          // locate msgs by EUID
        CDB_USERSBYNUMBER,      // index of users by number
-       CDB_EXTAUTH,            // associates OpenIDs with users
+       CDB_UNUSED1,            // this used to be the EXTAUTH table but is no longer used
        CDB_CONFIG,             // system configuration database
        MAXCDB                  // total number of CDB's defined
 };