X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitadel.h;h=4cbe92b60505d404f941fcd501f04f8ea27bceb2;hb=4bb58f061555ed9770803727c1408ede497deb32;hp=1a759e4ffd6c47e730e3f2289f74b9502f824499;hpb=1aabcbba9e94fd9bb27af2fb4721a7e8149a24ff;p=citadel.git

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 1a759e4ff..4cbe92b60 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -47,13 +47,20 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL	725		/* This version */
+#define REV_LEVEL	732		/* This version */
 #define REV_MIN		591		/* Oldest compatible database */
 #define EXPORT_REV_MIN	725		/* Oldest compatible export files */
+#define LIBCITADEL_MIN	107		/* Minimum required version of libcitadel */
 
 #define SERVER_TYPE 0			/* zero for stock Citadel; other developers please
 					   obtain SERVER_TYPE codes for your implementations */
 
+#ifdef LIBCITADEL_VERSION_NUMBER
+#if LIBCITADEL_VERSION_NUMBER < LIBCITADEL_MIN
+#error libcitadel is too old.  Please upgrade it before continuing.
+#endif
+#endif
+
 /* Various length constants */
 
 #define UGLISTLEN	100	/* you get a ungoto list of this size */
@@ -70,6 +77,7 @@ extern "C" {
 /*
  * Message expiration policy stuff
  */
+typedef struct ExpirePolicy ExpirePolicy;
 struct ExpirePolicy {
 /*
 #include "datadefinitions.h"
@@ -91,6 +99,7 @@ struct ExpirePolicy {
  * fetches from the server.  This allows the client to "march" through
  * relevant rooms without having to ask the server each time where to go next.
  */
+typedef struct march march;
 struct march {
 /*
 #include "datadefinitions.h"
@@ -120,6 +129,7 @@ struct march {
 /*
  * User records.
  */
+typedef struct ctdluser ctdluser;
 struct ctdluser {			/* User record                      */
 /*
 #include "datadefinitions.h"
@@ -151,6 +161,7 @@ struct ctdluser {			/* User record                      */
 /*
  * Room records.
  */
+typedef struct ctdlroom ctdlroom;
 struct ctdlroom {
 /*
 #include "datadefinitions.h"
@@ -197,6 +208,7 @@ struct ctdlroom {
 /*
  * Floor record.  The floor number is implicit in its location in the file.
  */
+typedef struct floor floor;
 struct floor {
 /*
 #include "datadefinitions.h"
@@ -270,25 +282,12 @@ enum {
 #define LONG_MAX 2147483647L
 #endif
 
-
-/*
- * Views
- */
-#define	VIEW_BBS		0	/* Bulletin board view */
-#define VIEW_MAILBOX		1	/* Mailbox summary */
-#define VIEW_ADDRESSBOOK	2	/* Address book view */
-#define VIEW_CALENDAR		3	/* Calendar view */
-#define VIEW_TASKS		4	/* Tasks view */
-#define VIEW_NOTES		5	/* Notes view */
-#define	VIEW_WIKI		6	/* Wiki view */
-#define VIEW_CALBRIEF		7	/* Brief Calendar view */
-#define VIEW_JOURNAL		8	/* Journal view (not yet implemented in native clients) */
-
 /*
  * Authentication modes
  */
 #define AUTHMODE_NATIVE		0	/* native Citadel authentication */
 #define AUTHMODE_HOST		1	/* host integrated */
+#define AUTHMODE_LDAP		2	/* external LDAP authentication */
 
 #ifdef __cplusplus
 }