Internal version number to 8.01 for imminent release

[citadel.git] / citadel / citadel.h

diff --git a/citadel/citadel.h b/citadel/citadel.h
index c74bef1a6f9d9ca319c3656be3d26911ecc9279a..f3ef0ceb0c0426a59fed397846b0209eb8ffd21e 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -1,8 +1,21 @@
 /*
- * $Id$
- *
  * Main Citadel header file
- * See copyright.txt for copyright information.
+ *
+ * Copyright (c) 1987-2010 by the citadel.org team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /* system customizations are in sysconfig.h */
@@ -38,10 +51,10 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      732             /* This version */
+#define REV_LEVEL      801             /* This version */
 #define REV_MIN                591             /* Oldest compatible database */
-#define EXPORT_REV_MIN 725             /* Oldest compatible export files */
-#define LIBCITADEL_MIN 109             /* Minimum required version of libcitadel */
+#define EXPORT_REV_MIN 760             /* Oldest compatible export files */
+#define LIBCITADEL_MIN 801             /* Minimum required version of libcitadel */
 
 #define SERVER_TYPE 0                  /* zero for stock Citadel; other developers please
                                           obtain SERVER_TYPE codes for your implementations */
@@ -138,8 +151,6 @@ struct ctdluser {                   /* User record                      */
        time_t lastcall;                /* Date/time of most recent login    */
        int USuserpurge;                /* Purge time (in days) for user     */
        char fullname[64];              /* Display name (primary identifier) */
-       cit_uint8_t USscreenwidth;      /* Screen width (for textmode users) */
-       cit_uint8_t USscreenheight;     /* Screen height(for textmode users) */
 };
 
 
@@ -266,8 +277,9 @@ enum {
 #define IGNETMAP       "application/x-citadel-ignet-map"
 #define FILTERLIST     "application/x-citadel-filter-list"
 #define SIEVECONFIG    "application/x-citadel-sieve-config"
+#define XMPPMORTUARY   "application/x-citadel-xmpp-mortuary"
 
-#define TRACE  CtdlLogPrintf(CTDL_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
+#define TRACE  syslog(LOG_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
 
 #ifndef LONG_MAX
 #define LONG_MAX 2147483647L
@@ -276,9 +288,10 @@ enum {
 /*
  * Authentication modes
  */
-#define AUTHMODE_NATIVE                0       /* native Citadel authentication */
-#define AUTHMODE_HOST          1       /* host integrated */
-#define AUTHMODE_LDAP          2       /* external LDAP authentication */
+#define AUTHMODE_NATIVE                0       /* Native (self-contained or "black box") */
+#define AUTHMODE_HOST          1       /* Authenticate against the host OS user database */
+#define AUTHMODE_LDAP          2       /* Authenticate against an LDAP server with RFC 2307 schema */
+#define AUTHMODE_LDAP_AD       3       /* Authenticate against non-standard MS Active Directory LDAP */
 
 #ifdef __cplusplus
 }