X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitadel.h;h=6e1ed632afb5eacaa8797352c5f342891a35f90f;hb=71f06c155fe24e273437baa9a71156035c68a877;hp=fea62aaa2909207792589115f9f5f2c1a0bf3114;hpb=6334f45b8884526db61d334b7e69b03440059517;p=citadel.git

diff --git a/citadel/citadel.h b/citadel/citadel.h
index fea62aaa2..6e1ed632a 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -1,7 +1,7 @@
 /*
  * Main Citadel header file
  *
- * Copyright (c) 1987-2018 by the citadel.org team
+ * Copyright (c) 1987-2020 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.
@@ -35,13 +35,11 @@ extern "C" {
  */
 #define CITADEL	PACKAGE_STRING
 
-#define REV_LEVEL	917		// This version
+#define REV_LEVEL 932		// This version
 #define REV_MIN		591		// Oldest compatible database
-#define EXPORT_REV_MIN	760		// Oldest compatible export files
-#define LIBCITADEL_MIN	917		// Minimum required version of libcitadel
-
-#define SERVER_TYPE 0			// zero for stock Citadel; other developers please
-					// obtain SERVER_TYPE codes for your implementations
+#define EXPORT_REV_MIN	931		// Oldest compatible export files
+#define LIBCITADEL_MIN	931		// Minimum required version of libcitadel
+#define SERVER_TYPE	0		// zero for stock Citadel; other developers please obtain SERVER_TYPE codes for your implementations
 
 #ifdef LIBCITADEL_VERSION_NUMBER
 #if LIBCITADEL_VERSION_NUMBER < LIBCITADEL_MIN
@@ -49,6 +47,13 @@ extern "C" {
 #endif
 #endif
 
+/*
+ * This is the user name and password for the default administrator account
+ * that is created when Citadel Server is started with an empty database.
+ */
+#define DEFAULT_ADMIN_USERNAME	"admin"
+#define DEFAULT_ADMIN_PASSWORD	"citadel"
+
 /* Various length constants */
 
 #define ROOMNAMELEN	128		/* The size of a roomname string */
@@ -92,7 +97,7 @@ struct march {
  */
 typedef struct ctdluser ctdluser;
 struct ctdluser {			// User record
-	int version;			// Cit vers. which created this rec
+	int version;			// Citadel version which created this record
 	uid_t uid;			// Associate with a unix account?
 	char password[32];		// password
 	unsigned flags;			// See US_ flags below
@@ -106,6 +111,8 @@ struct ctdluser {			// User record
 	long msgnum_bio;		// msgnum of user's profile (bio)
 	long msgnum_pic;		// msgnum of user's avatar (photo)
 	char emailaddrs[512];		// Internet email addresses
+	long msgnum_inboxrules;		// msgnum of user's inbox filtering rules
+	long lastproc_inboxrules;	// msgnum of last message filtered
 };
 
 
@@ -152,7 +159,6 @@ struct ctdlroom {
 #define MES_ERROR	(-1)		// Can't send message due to bad address
 #define MES_LOCAL	0		// Local message, do no network processing
 #define MES_INTERNET	1		// Convert msg and send as Internet mail
-#define MES_IGNET	2		// Process recipient and send via Cit net
 
 /****************************************************************************/
 
@@ -179,7 +185,7 @@ struct floor {
 /* number of items which may be handled by the CONF command */
 #define NUM_CONFIGS 71
 
-#define TRACE	syslog(LOG_DEBUG, "\033[31mCheckpoint: %s : %d\033[0m", __FILE__, __LINE__)
+#define TRACE	syslog(LOG_DEBUG, "\033[7m  Checkpoint: %s : %d  \033[0m", __FILE__, __LINE__)
 
 #ifndef LONG_MAX
 #define LONG_MAX 2147483647L
@@ -197,4 +203,9 @@ struct floor {
 }
 #endif
 
+#if __GNUC__ >= 8
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+#endif
+
 #endif /* CITADEL_H */