X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitadel.h;h=8c58ff58dad1cdfc9b55ea5ecec9c4055996bffe;hb=be3f771778c5570f9e197ab4701d014e00375bb4;hp=92dfc5f6e6ec90dec7b20da6ef51cbed9373d3c6;hpb=f2c07f3fa5c0904b970b6cc45416831f638a733f;p=citadel.git

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 92dfc5f6e..8c58ff58d 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -1,8 +1,15 @@
 /*
- * $Id$
- *
  * Main Citadel header file
- * See COPYING 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 */
@@ -38,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	760		/* This version */
+#define REV_LEVEL	810		/* This version */
 #define REV_MIN		591		/* Oldest compatible database */
 #define EXPORT_REV_MIN	760		/* Oldest compatible export files */
-#define LIBCITADEL_MIN	744		/* Minimum required version of libcitadel */
+#define LIBCITADEL_MIN	810		/* Minimum required version of libcitadel */
 
 #define SERVER_TYPE 0			/* zero for stock Citadel; other developers please
 					   obtain SERVER_TYPE codes for your implementations */
@@ -70,11 +77,6 @@ extern "C" {
  */
 typedef struct ExpirePolicy ExpirePolicy;
 struct ExpirePolicy {
-/*
-#include "datadefinitions.h"
-#include "dtds/expirepolicy-defs.h"
-#include "undef_data.h"
-*/
 	int expire_mode;
 	int expire_value;
 };
@@ -92,11 +94,6 @@ struct ExpirePolicy {
  */
 typedef struct march march;
 struct march {
-/*
-#include "datadefinitions.h"
-#include "dtds/march-defs.h"
-#include "undef_data.h"
-*/
 	struct march *next;
 	char march_name[ROOMNAMELEN];
 	unsigned int march_flags;
@@ -122,11 +119,6 @@ struct march {
  */
 typedef struct ctdluser ctdluser;
 struct ctdluser {			/* User record                      */
-/*
-#include "datadefinitions.h"
-#include "dtds/user-defs.h"
-#include "undef_data.h"
-*/
 	int version;			/* Cit vers. which created this rec  */
 	uid_t uid;			/* Associate with a unix account?    */
 	char password[32];		/* password                          */
@@ -138,8 +130,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) */
 };
 
 
@@ -154,11 +144,6 @@ struct ctdluser {			/* User record                      */
  */
 typedef struct ctdlroom ctdlroom;
 struct ctdlroom {
-/*
-#include "datadefinitions.h"
-#include "dtds/room-defs.h"
-#include "undef_data.h"
-*/
  	char QRname[ROOMNAMELEN];	/* Name of room                     */
  	char QRpasswd[10];		/* Only valid if it's a private rm  */
  	long QRroomaide;		/* User number of room aide         */
@@ -201,11 +186,6 @@ struct ctdlroom {
  */
 typedef struct floor floor;
 struct floor {
-/*
-#include "datadefinitions.h"
-#include "dtds/floor-defs.h"
-#include "undef_data.h"
-*/
 	unsigned short f_flags;		/* flags */
 	char f_name[256];		/* name of floor */
 	int f_ref_count;		/* reference count */
@@ -235,11 +215,6 @@ struct floor {
 #define	NEXT_KEY	15
 #define STOP_KEY	3
 
-/* server exit codes */
-#define EXIT_NORMAL	0		/* server terminated normally */
-					/* 1 through 63 reserved for signals */
-#define EXIT_NULL	64		/* EOF on server command input */
-
 /* citadel.rc stuff */
 #define RC_NO		0		/* always no */
 #define RC_YES		1		/* always yes */
@@ -266,8 +241,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
@@ -278,7 +254,8 @@ enum {
  */
 #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 */
+#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
 }