* Replaced all "Citadel/UX" references with "Citadel"

[citadel.git] / citadel / citadel.h

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 3d2434bea06a6395d60295a786a1fa497ed69381..0559ba334d4d36a8128290318d42af0e66cf1e49 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * main Citadel/UX header file
+ * main Citadel header file
  * see copyright.txt for copyright information
  */
 
@@ -32,7 +32,7 @@ extern "C" {
 /*
  * Text description of this software
  */
-#define CITADEL        "Citadel/UX 6.12"
+#define CITADEL        "Citadel 6.23"
 
 /*
  * REV_LEVEL is the current version number (multiplied by 100 to avoid having
@@ -44,11 +44,11 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      612             /* This version */
+#define REV_LEVEL      623             /* This version */
 #define REV_MIN                591             /* Oldest compatible database */
-#define EXPORT_REV_MIN 612             /* Oldest compatible export files */
+#define EXPORT_REV_MIN 623             /* Oldest compatible export files */
 
-#define SERVER_TYPE 0  /* zero for stock Citadel/UX; other developers please
+#define SERVER_TYPE 0  /* zero for stock Citadel; other developers please
                           obtain SERVER_TYPE codes for your implementations */
 
 /* Various length constants */
@@ -107,7 +107,7 @@ struct config {
        char c_niu_2[15];               /* (not in use)                     */
        int c_setup_level;              /* what rev level we've setup to    */
        int c_maxsessions;              /* maximum concurrent sessions      */
-       char c_niu_3[20];               /* (not in use)                     */
+       char c_ip_addr[20];             /* IP address to listen on          */
        int c_port_number;              /* Cit listener port (usually 504)  */
        int c_ipgm_secret;              /* Internal program authentication  */
        struct ExpirePolicy c_ep;       /* System default msg expire policy */
@@ -125,10 +125,16 @@ struct config {
        int c_imap_port;                /* IMAP listener port (usually 143) */
        time_t c_net_freq;              /* how often to run the networker   */
        char c_disable_newu;            /* disable NEWU command             */
-       char c_aide_mailboxes;          /* give Aides access to mailboxes   */
+       char c_niu_4;                   /* (not in use)                     */
        char c_baseroom[ROOMNAMELEN];   /* Name of baseroom (Lobby)         */
        char c_aideroom[ROOMNAMELEN];   /* Name of aideroom (Aide)          */
        int c_purge_hour;               /* Hour during which db purges run  */
+       struct ExpirePolicy c_mbxep;    /* Expire policy for mailbox rooms  */
+       char c_ldap_host[128];          /* Host where LDAP service lives    */
+       int c_ldap_port;                /* Port on host where LDAP lives    */
+       char c_ldap_base_dn[256];       /* LDAP base DN                     */
+       char c_ldap_bind_dn[256];       /* LDAP bind DN                     */
+       char c_ldap_bind_pw[256];       /* LDAP bind password               */
 };
 
 /*
@@ -243,7 +249,7 @@ struct floor {
        char f_name[256];               /* name of floor */
        int f_ref_count;                /* reference count */
        struct ExpirePolicy f_ep;       /* default expiration policy */
-       };
+};
 
 #define F_INUSE                1               /* floor is in use */
 
@@ -298,9 +304,8 @@ enum {
 #define IGNETCFG       "application/x-citadel-ignet-config"
 #define IGNETMAP       "application/x-citadel-ignet-map"
 #define FILTERLIST     "application/x-citadel-filter-list"
-#define SPAMSTRINGS    "application/x-citadel-spam-strings"
 
-#define TRACE  lprintf(9, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
+#define TRACE  lprintf(CTDL_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
 
 #ifndef LONG_MAX
 #define LONG_MAX 2147483647L
@@ -313,19 +318,11 @@ enum {
 #define        VIEW_BBS                0       /* Traditional Citadel BBS 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 */
 
 #ifdef __cplusplus
 }
 #endif
 
-#ifdef tmpnam
-#undef tmpnam
-#endif
-#define tmpnam(x)      CtdlTempFileName(__FILE__, __LINE__)
-
-#ifdef tmpfile
-#undef tmpfile
-#endif
-#define tmpfile()      CtdlTempFile()
-
 #endif /* CITADEL_H */