Remember the last version of Berkeley DB that touched the

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index 2a4aa0956decf92175acad70d781980257fe0efa..bf3c71f3286c52ed325f9e2d9ea59de6ac3dc1f9 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -42,7 +42,7 @@ struct CtdlMessage {
 #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    108     /* Incorrect version of libcitadel */
+#define CTDLEXIT_LIBCITADEL    106     /* Incorrect version of libcitadel */
 
 
 
@@ -144,7 +144,8 @@ struct CitContext {
        char *session_specific_data;            /* Used by individual protocol modules */
        struct cit_ical *CIT_ICAL;              /* calendaring data */
        struct ma_info *ma;                     /* multipart/alternative data */
-       const char* ServiceName;                /**< whats our actual purpose? */
+       const char *ServiceName;                /* readable purpose of this session */
+       void *openid_data;                      /* Data stored by the OpenID module */
 };
 
 typedef struct CitContext t_context;
@@ -184,6 +185,7 @@ struct CitControl {
        int version;                    /* Server-hosted upgrade level      */
        int 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 struct CitContext *ContextList;
@@ -243,6 +245,7 @@ enum {
        S_THREAD_LIST,
        S_XMPP_QUEUE,
        S_SCHEDULE_LIST,
+       S_OPENID_ASSOC,
        MAX_SEMAPHORES
 };
 
@@ -397,6 +400,6 @@ struct UseTable {
 /*               **********                    Important fields                */
 /*                         ***************     Semi-important fields           */
 /*                                        *    Message text (MUST be last)     */
-#define FORDER "IPTAFONHRDBCEJGKLQSVWXZYUM"
+#define FORDER "IPTAFONHRDBCEWJGKLQSVXZYUM"
 
 #endif /* SERVER_H */