* Backed out r7276 through r7278. This is too large a change to make during a featur...

[citadel.git] / citadel / citadel.h

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 0e58afd369f7b81e8f2a57182e9878494ab85707..5751624e7c54154b4ae0eed7e18efddfae64a527 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -2,7 +2,7 @@
  * $Id$
  *
  * Main Citadel header file
- * See copyright.txt for copyright information.
+ * See COPYING for copyright information.
  */
 
 /* system customizations are in sysconfig.h */
@@ -11,15 +11,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 +38,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      743             /* 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 737             /* Oldest compatible export files */
+#define LIBCITADEL_MIN 743             /* Minimum required version of libcitadel */
 
 #define SERVER_TYPE 0                  /* zero for stock Citadel; other developers please
                                           obtain SERVER_TYPE codes for your implementations */
@@ -276,7 +267,7 @@ enum {
 #define FILTERLIST     "application/x-citadel-filter-list"
 #define SIEVECONFIG    "application/x-citadel-sieve-config"
 
-#define TRACE  lprintf(CTDL_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
+#define TRACE  CtdlLogPrintf(CTDL_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
 
 #ifndef LONG_MAX
 #define LONG_MAX 2147483647L
@@ -285,9 +276,9 @@ 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       /* External LDAP authentication (NOT IMPLEMENTED) */
 
 #ifdef __cplusplus
 }