/*
* $Id$
*
- * main Citadel/UX header file
+ * main Citadel header file
* see copyright.txt for copyright information
*/
/*
* Text description of this software
*/
-#define CITADEL "Citadel/UX 6.08"
+#define CITADEL "Citadel 6.23"
/*
* REV_LEVEL is the current version number (multiplied by 100 to avoid having
* usually more strict because you're not really supposed to dump/load and
* upgrade at the same time.
*/
-#define REV_LEVEL 608 /* This version */
+#define REV_LEVEL 623 /* This version */
#define REV_MIN 591 /* Oldest compatible database */
-#define EXPORT_REV_MIN 608 /* 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 */
* Global system configuration.
*
* Developers: please do NOT remove the fields labelled "not in use". We
- * can't simply remove them from the struct, because that would render the
- * configs on existing systems corrupt. However, if you need the same number
- * of bytes for a *new* field, feel free to use them.
+ * can't simply remove them from the struct, because this gets written to
+ * disk, and if you change it then you'll break all existing systems.
+ * However, if you'd like to reclaim some of that space for another use, feel
+ * free to do so, as long as the sizes are kept identical.
*/
struct config {
char c_nodename[16]; /* Unqualified "short" nodename */
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_net_password[20]; /* system net password (obsolete) */
+ 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 */
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 */
};
/*
#define RESTRICT_INTERNET config.c_restrict
/*
- * User records. (It's called "usersupp" because in ancient times it was
- * a supplement to /etc/passwd, but not anymore.)
+ * User records.
*/
-struct usersupp { /* User record */
+struct ctdluser { /* User record */
int version; /* Cit vers. which created this rec */
uid_t uid; /* Associate with a unix account? */
char password[32]; /* password (for BBS-only users) */
#define MM_VALID 4 /* New users need validating */
/*
- * Room records. (It's called "quickroom" because it was once merely an
- * index to a "fullroom" file, but the new database layout changed everything.)
+ * Room records.
*/
-struct quickroom {
+struct ctdlroom {
char QRname[ROOMNAMELEN]; /* Name of room */
char QRpasswd[10]; /* Only valid if it's a private rm */
long QRroomaide; /* User number of room aide */
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 */
#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
#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 */