Fixed a bug in username key usage that was causing email aliases to disappear

[citadel.git] / citadel / citadel.h

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 4c6775d8f0d6ce63d2460749a0e9d83198554f75..6289547c8ff595bff6933d6376313430235b8285 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -1,7 +1,7 @@
 /*
  * Main Citadel header file
  *
- * Copyright (c) 1987-2017 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,23 +35,11 @@ extern "C" {
  */
 #define CITADEL        PACKAGE_STRING
 
-/*
- * REV_LEVEL is the current version number (multiplied by 100 to avoid having
- * to fiddle with the decimal).  REV_MIN is the oldest version of Citadel
- * whose data files are compatible with the current version.  If the data files
- * are older than REV_MIN, none of the programs will work until the setup
- * program is run again to bring things up to date.  EXPORT_REV_MIN is the
- * oldest version of Citadel whose export files we can read.  The latter is
- * usually more strict because you're not really supposed to dump/load and
- * upgrade at the same time.
- */
-#define REV_LEVEL      913             // This version
+#define REV_LEVEL      929             // This version
 #define REV_MIN                591             // Oldest compatible database
 #define EXPORT_REV_MIN 760             // Oldest compatible export files
-#define LIBCITADEL_MIN 903             // Minimum required version of libcitadel
-
-#define SERVER_TYPE 0                  // zero for stock Citadel; other developers please
-                                       // obtain SERVER_TYPE codes for your implementations
+#define LIBCITADEL_MIN 922             // 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
@@ -59,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 */
@@ -162,7 +157,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
 
 /****************************************************************************/
 
@@ -189,7 +183,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
@@ -207,4 +201,9 @@ struct floor {
 }
 #endif
 
+#if __GNUC__ >= 8
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+#endif
+
 #endif /* CITADEL_H */