X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitadel.h;h=35237621bd41837fbf6851f10883bb2552ceae20;hb=8d7cd043e07dfe4e0ae93befb667a2189e4b482d;hp=96908accef59c37d76e56d04f73dfa27ae294cd4;hpb=0c90ed3253337bfd864b4d780df4701d0cc0f2c4;p=citadel.git

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 96908acce..35237621b 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -1,7 +1,7 @@
 /*
  * Main Citadel header file
  *
- * Copyright (c) 1987-2019 by the citadel.org team
+ * Copyright (c) 1987-2021 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.
@@ -30,15 +30,14 @@ extern "C" {
 
 /*
  * Text description of this software
- * (We used to define this ourselves, but why bother when
- * the GNU build tools do it for us?)
+ * (We used to define this ourselves, but why bother when the build tools do it for us?)
  */
 #define CITADEL	PACKAGE_STRING
 
-#define REV_LEVEL	928		// 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	922		// Minimum required version of libcitadel
+#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
@@ -47,6 +46,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 */
@@ -90,7 +96,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
@@ -104,6 +110,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
 };
 
 
@@ -147,10 +155,6 @@ struct ctdlroom {
 #define MES_ANONONLY	66		// "****" header
 #define MES_ANONOPT	67		// "Anonymous" header
 
-#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
-
 /****************************************************************************/
 
 /*