X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitadel.h;h=4d518d37b8e16db70ae250fc6105a56e59a53702;hb=fef8075c28c6fdf09f0f84ec8448cbbe6362bff9;hp=0e58afd369f7b81e8f2a57182e9878494ab85707;hpb=35707bd874630d38fb1b9d13fd0ad5e73c121217;p=citadel.git

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 0e58afd36..4d518d37b 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -1,8 +1,15 @@
 /*
- * $Id$
- *
  * Main Citadel header file
- * See copyright.txt for copyright information.
+ *
+ * Copyright (c) 1987-2012 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.
+ *
+ * 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.
  */
 
 /* system customizations are in sysconfig.h */
@@ -11,15 +18,6 @@
 #define CITADEL_H
 /* #include <dmalloc.h> uncomment if using dmalloc */
 
-/* Build Citadel with the calendar service only if the header *and*
- * library for libical are both present.
- */
-#ifdef HAVE_LIBICAL
-#ifdef HAVE_ICAL_H
-#define CITADEL_WITH_CALENDAR_SERVICE 1
-#endif
-#endif
-
 #include "sysdep.h"
 #include <limits.h>
 #include "sysconfig.h"
@@ -47,10 +45,10 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL	730		/* This version */
+#define REV_LEVEL	805		/* This version */
 #define REV_MIN		591		/* Oldest compatible database */
-#define EXPORT_REV_MIN	725		/* Oldest compatible export files */
-#define LIBCITADEL_MIN	104		/* Minimum required version of libcitadel */
+#define EXPORT_REV_MIN	760		/* Oldest compatible export files */
+#define LIBCITADEL_MIN	805		/* Minimum required version of libcitadel */
 
 #define SERVER_TYPE 0			/* zero for stock Citadel; other developers please
 					   obtain SERVER_TYPE codes for your implementations */
@@ -147,8 +145,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) */
 };
 
 
@@ -275,8 +271,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	lprintf(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
@@ -285,9 +282,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
 }