citadel.h is now citadel_defs.h

diff --git a/citadel/Makefile b/citadel/Makefile
index bda087100041d2a16583d69f5f9613affdf2e067..c89f92cc0aa6d115a38e8ffef2d8962b5edd6228 100644 (file)
--- a/citadel/Makefile
+++ b/citadel/Makefile
@@ -1,5 +1,5 @@
 # Makefile for Citadel Server
-# Copyright (c) 1987-2022 by Art Cancro and the citadel.org team
+# Copyright (c) 1987-2023 by Art Cancro and the citadel.org team
 #
 # No, we are NOT using the obsolete GNU Autotools.  This configure script works
 # well on the Linux operating system (which uses the Linux kernel) and on BSD.
@@ -18,7 +18,6 @@ citserver: server/*.c server/modules/*/*.c config.mk server/*.h
        cc ${CFLAGS} \
                server/*.c server/modules/*/*.c \
                ${LDFLAGS} -lresolv -lcitadel -lpthread -lz -lical -lldap -lcrypt -lexpat -lcurl -ldb \
-               -Wno-deprecated-declarations \
                -o citserver
 
 setup: utils/setup.c server/citadel_dirs.c utils/*.h server/*.h

diff --git a/citadel/server/citadel.h b/citadel/server/citadel.h
deleted file mode 100644 (file)
index 84e5b83..0000000
--- a/citadel/server/citadel.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// Main Citadel header file
-//
-// Copyright (c) 1987-2022 by the citadel.org team
-//
-// This program is open source software.  Use, duplication, or disclosure
-// is subject to the terms of the GNU General Public License, version 3.
-// The program is distributed without any warranty, expressed or implied.
-
-#ifndef CITADEL_H
-#define CITADEL_H
-
-// Suppress these compiler warnings
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
-#pragma GCC diagnostic ignored "-Wformat-truncation"
-
-#include "sysdep.h"
-#include <limits.h>
-#include "sysconfig.h"
-#include "typesize.h"
-#include "ipcdef.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define REV_LEVEL 972          // This version
-#define REV_MIN                591             // Oldest compatible database
-#define EXPORT_REV_MIN 931             // Oldest compatible export files
-#define LIBCITADEL_MIN 951             // Minimum required version of libcitadel
-#define SERVER_TYPE    0               // zero for stock Citadel; other developers please obtain SERVER_TYPE codes for your implementations
-
-// hats off to https://stackoverflow.com/questions/5459868/concatenate-int-to-string-using-c-preprocessor
-#define STR_HELPER(x) #x
-#define STR(x) STR_HELPER(x)
-#define CITADEL        "Citadel Server " STR(REV_LEVEL)
-
-#ifdef LIBCITADEL_VERSION_NUMBER
-#if LIBCITADEL_VERSION_NUMBER < LIBCITADEL_MIN
-#error libcitadel is too old.  Please upgrade it before continuing.
-#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
-#define USERNAME_SIZE  64              // The size of a username string
-#define MAX_EDITORS    5               // number of external editors supported ; must be at least 1
-
-// Message expiration policy stuff
-typedef struct ExpirePolicy ExpirePolicy;
-struct ExpirePolicy {
-       int expire_mode;
-       int expire_value;
-};
-
-#define EXPIRE_NEXTLEVEL       0       // Inherit expiration policy
-#define EXPIRE_MANUAL          1       // Don't expire messages at all
-#define EXPIRE_NUMMSGS         2       // Keep only latest n messages
-#define EXPIRE_AGE             3       // Expire messages after n days
-
-// Bits which may appear in MMflags.
-#define MM_VALID       4               // New users need validating
-
-// Miscellaneous
-#define MES_NORMAL     65              // Normal message
-#define MES_ANONONLY   66              // "****" header
-#define MES_ANONOPT    67              // "Anonymous" header
-
-// Values used internally for function call returns, etc.
-#define NEWREGISTER    0               // new user to register
-#define REREGISTER     1               // existing user reregistering
-
-// number of items which may be handled by the CONF command
-#define NUM_CONFIGS 71
-
-#define TRACE  syslog(LOG_DEBUG, "\033[7m  Checkpoint: %s : %d  \033[0m", __FILE__, __LINE__)
-
-#ifndef LONG_MAX
-#define LONG_MAX 2147483647L
-#endif
-
-// Authentication modes
-#define AUTHMODE_NATIVE                0       // Native (self-contained or "black box")
-#define AUTHMODE_HOST          1       // Authenticate against the host OS user database
-#define AUTHMODE_LDAP          2       // Authenticate using LDAP server with POSIX schema
-#define AUTHMODE_LDAP_AD       3       // Authenticate using LDAP server with Active Directory schema
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // CITADEL_H

diff --git a/citadel/server/citadel_defs.h b/citadel/server/citadel_defs.h
new file mode 100644 (file)
index 0000000..f19067f
--- /dev/null
+++ b/citadel/server/citadel_defs.h
@@ -0,0 +1,79 @@
+// Definitions for the Citadel Server
+//
+// Copyright (c) 1987-2023 by the citadel.org team
+//
+// This program is open source software.  Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
+// The program is distributed without any warranty, expressed or implied.
+
+#ifndef CITADEL_H
+#define CITADEL_H
+
+// Suppress these compiler warnings
+#pragma GCC diagnostic ignored "-Wcast-qual"
+#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+#include "sysdep.h"
+#include <limits.h>
+#include "sysconfig.h"
+#include "typesize.h"
+#include "ipcdef.h"
+
+
+#define REV_LEVEL 972          // This version
+#define REV_MIN                591             // Oldest compatible database
+#define EXPORT_REV_MIN 931             // Oldest compatible export files
+#define LIBCITADEL_MIN 951             // Minimum required version of libcitadel
+#define SERVER_TYPE    0               // zero for stock Citadel; other developers please obtain SERVER_TYPE codes for your implementations
+
+// hats off to https://stackoverflow.com/questions/5459868/concatenate-int-to-string-using-c-preprocessor
+#define STR_HELPER(x) #x
+#define STR(x) STR_HELPER(x)
+#define CITADEL        "Citadel Server " STR(REV_LEVEL)
+
+#ifdef LIBCITADEL_VERSION_NUMBER
+#if LIBCITADEL_VERSION_NUMBER < LIBCITADEL_MIN
+#error libcitadel is too old.  Please upgrade it before continuing.
+#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
+#define USERNAME_SIZE  64              // The size of a username string
+#define MAX_EDITORS    5               // number of external editors supported ; must be at least 1
+
+// Bits which may appear in MMflags.
+#define MM_VALID       4               // New users need validating
+
+// Miscellaneous
+#define MES_NORMAL     65              // Normal message
+#define MES_ANONONLY   66              // "****" header
+#define MES_ANONOPT    67              // "Anonymous" header
+
+// Values used internally for function call returns, etc.
+#define NEWREGISTER    0               // new user to register
+#define REREGISTER     1               // existing user reregistering
+
+// number of items which may be handled by the CONF command
+#define NUM_CONFIGS 71
+
+#define TRACE  syslog(LOG_DEBUG, "\033[7m  Checkpoint: %s : %d  \033[0m", __FILE__, __LINE__)
+
+#ifndef LONG_MAX
+#define LONG_MAX 2147483647L
+#endif
+
+// Authentication modes
+#define AUTHMODE_NATIVE                0       // Native (self-contained or "black box")
+#define AUTHMODE_HOST          1       // Authenticate against the host OS user database
+#define AUTHMODE_LDAP          2       // Authenticate using LDAP server with POSIX schema
+#define AUTHMODE_LDAP_AD       3       // Authenticate using LDAP server with Active Directory schema
+
+#endif // CITADEL_H

diff --git a/citadel/server/citadel_dirs.c b/citadel/server/citadel_dirs.c
index bad200ef3e8373109d891538c07f490cca1a3ce8..6fce40cb192acad78e42606a1de7c1fa1af15f7b 100644 (file)
--- a/citadel/server/citadel_dirs.c
+++ b/citadel/server/citadel_dirs.c
@@ -15,7 +15,7 @@
 #include <errno.h>
 #include <syslog.h>
 #include <libcitadel.h>
-#include "citadel.h"
+#include "citadel_defs.h"
 #include "server.h"
 #include "citadel_dirs.h"
 

diff --git a/citadel/server/default_timezone.c b/citadel/server/default_timezone.c
index b7090d966f1e0fefa0fc3c73b9c35456f4590758..0e1547e11f8410b831527208ff951c8c753270c7 100644 (file)
--- a/citadel/server/default_timezone.c
+++ b/citadel/server/default_timezone.c
@@ -15,7 +15,7 @@
 #include <syslog.h>
 #include <libical/ical.h>
 #include <libcitadel.h>
-#include "citadel.h"
+#include "citadel_defs.h"
 #include "server.h"
 #include "citserver.h"
 #include "sysdep_decls.h"

diff --git a/citadel/server/domain.c b/citadel/server/domain.c
index 460c3937bba87c05448260ef8a5646a379c9a0d7..8fbc9b08e63447b1fb747e29195c44c054d6c796 100644 (file)
--- a/citadel/server/domain.c
+++ b/citadel/server/domain.c
@@ -20,7 +20,7 @@
 #endif
 #include <libcitadel.h>
 #include "sysdep_decls.h"
-#include "citadel.h"
+#include "citadel_defs.h"
 #include "domain.h"
 #include "internet_addressing.h"
 

diff --git a/citadel/server/internet_addressing.c b/citadel/server/internet_addressing.c
index 59a1b91b2eb5cd478ee843ab00585ff494e49f2a..9cfbe3b8ad1f32077870904c793ef239fcb4ac7c 100644 (file)
--- a/citadel/server/internet_addressing.c
+++ b/citadel/server/internet_addressing.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "citadel.h"
+#include "citadel_defs.h"
 #include "server.h"
 #include "sysdep_decls.h"
 #include "citserver.h"

diff --git a/citadel/server/modules/blog/serv_blog.c b/citadel/server/modules/blog/serv_blog.c
index 4751e35c08ea33f579ca14d0c9a62c47a75f2aaa..da9c199c0697fdc1baa75a35583cfb8e24edc227 100644 (file)
--- a/citadel/server/modules/blog/serv_blog.c
+++ b/citadel/server/modules/blog/serv_blog.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/checkpoint/serv_checkpoint.c b/citadel/server/modules/checkpoint/serv_checkpoint.c
index 96cc8e132337777bb20e4a39f10defed3d02c76f..ff3154a57f8236325d4cbcfd48c77c458072e2ca 100644 (file)
--- a/citadel/server/modules/checkpoint/serv_checkpoint.c
+++ b/citadel/server/modules/checkpoint/serv_checkpoint.c
@@ -22,7 +22,7 @@
 
 #include <libcitadel.h>
 
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../msgbase.h"

diff --git a/citadel/server/modules/clamav/serv_virus.c b/citadel/server/modules/clamav/serv_virus.c
index 0ec85682bf8e4fe7bcbd604906181b90a7eeac87..5149988d3b118e6638593c46bc8b1cb75fb1c484 100644 (file)
--- a/citadel/server/modules/clamav/serv_virus.c
+++ b/citadel/server/modules/clamav/serv_virus.c
@@ -32,7 +32,7 @@
 #include <limits.h>
 #include <sys/socket.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/crypto/serv_crypto.c b/citadel/server/modules/crypto/serv_crypto.c
index 3b6a88995e814e95b6ba96d8a8eace5033c6772d..529579aa0b5ed159bd637843ec3e8af89f1b3fe5 100644 (file)
--- a/citadel/server/modules/crypto/serv_crypto.c
+++ b/citadel/server/modules/crypto/serv_crypto.c
@@ -35,7 +35,7 @@
 #include "../../server.h"
 #include "serv_crypto.h"
 #include "../../sysdep_decls.h"
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../config.h"
 #include "../../ctdl_module.h"
 

diff --git a/citadel/server/modules/expire/expire_policy.c b/citadel/server/modules/expire/expire_policy.c
index 6aaeeff932663cc468409d45e9c50930a44f1b1f..32db98ad2ccc62b5b4d4849b59fc19afa122c5a6 100644 (file)
--- a/citadel/server/modules/expire/expire_policy.c
+++ b/citadel/server/modules/expire/expire_policy.c
@@ -21,7 +21,7 @@
 #include <time.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../database.h"
 #include "../../config.h"

diff --git a/citadel/server/modules/expire/serv_expire.c b/citadel/server/modules/expire/serv_expire.c
index e25a184487071c2006753c4d874e593fc33ca19e..58988c197a0398828286c6ebed065d86b4fa1a8c 100644 (file)
--- a/citadel/server/modules/expire/serv_expire.c
+++ b/citadel/server/modules/expire/serv_expire.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/fulltext/ft_wordbreaker.c b/citadel/server/modules/fulltext/ft_wordbreaker.c
index d5a07d43c70c11498b9a03831b4726f434e34910..81e605626291804b10c27f66be4c8e9f153aaafd 100644 (file)
--- a/citadel/server/modules/fulltext/ft_wordbreaker.c
+++ b/citadel/server/modules/fulltext/ft_wordbreaker.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../sysdep_decls.h"
 #include "../../citserver.h"

diff --git a/citadel/server/modules/fulltext/serv_fulltext.c b/citadel/server/modules/fulltext/serv_fulltext.c
index f5a63029c210d949fa9f724b0a139ea85bd21f94..3ad99085f0074a5b00696bfc76dd32c30024ca42 100644 (file)
--- a/citadel/server/modules/fulltext/serv_fulltext.c
+++ b/citadel/server/modules/fulltext/serv_fulltext.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/imap/imap_acl.c b/citadel/server/modules/imap/imap_acl.c
index 6c98f2edad42e5dfa63a9f743d5392a0613637a6..bba4bd7a44558427a974850985bbd983b1c54ab0 100644 (file)
--- a/citadel/server/modules/imap/imap_acl.c
+++ b/citadel/server/modules/imap/imap_acl.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../sysdep_decls.h"
 #include "../../citserver.h"

diff --git a/citadel/server/modules/imap/imap_fetch.c b/citadel/server/modules/imap/imap_fetch.c
index 2ac8745c87a6f2b288af6642a386cb8c1726e42b..0434879193d0b3aab44c8ae7b18038d1206a74ef 100644 (file)
--- a/citadel/server/modules/imap/imap_fetch.c
+++ b/citadel/server/modules/imap/imap_fetch.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../sysdep_decls.h"
 #include "../../citserver.h"

diff --git a/citadel/server/modules/imap/imap_list.c b/citadel/server/modules/imap/imap_list.c
index a256a5cbc01bae38e00f728162760ca2019b2741..7565d8e94bb37ad3e5d2047609d52b042ef1a82f 100644 (file)
--- a/citadel/server/modules/imap/imap_list.c
+++ b/citadel/server/modules/imap/imap_list.c
@@ -33,7 +33,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../sysdep_decls.h"
 #include "../../citserver.h"

diff --git a/citadel/server/modules/imap/imap_metadata.c b/citadel/server/modules/imap/imap_metadata.c
index 425000ad03abf7aa30d51fff7e75e53974f09be5..3cfbbc81ea3a9aab9674782d1d9a422aa793fefb 100644 (file)
--- a/citadel/server/modules/imap/imap_metadata.c
+++ b/citadel/server/modules/imap/imap_metadata.c
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../sysdep_decls.h"
 #include "../../citserver.h"

diff --git a/citadel/server/modules/imap/imap_misc.c b/citadel/server/modules/imap/imap_misc.c
index 50bd71424196fa942ad95cc6bf994afbcc192688..8d785cb61784fc5b014f92a467c246ca5e7c600f 100644 (file)
--- a/citadel/server/modules/imap/imap_misc.c
+++ b/citadel/server/modules/imap/imap_misc.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../sysdep_decls.h"
 #include "../../citserver.h"

diff --git a/citadel/server/modules/imap/imap_search.c b/citadel/server/modules/imap/imap_search.c
index b77169f42a0153779584027f21c0b9cf0d11b24d..72b57ba10e7c64b2ec3132bca57b9f44f5c217a8 100644 (file)
--- a/citadel/server/modules/imap/imap_search.c
+++ b/citadel/server/modules/imap/imap_search.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../sysdep_decls.h"
 #include "../../citserver.h"

diff --git a/citadel/server/modules/imap/imap_store.c b/citadel/server/modules/imap/imap_store.c
index 4b67bfc4ea324569a86e117b01e6aefafbbf84c9..103e951380d5ae14364b34b301e68b13a927f91f 100644 (file)
--- a/citadel/server/modules/imap/imap_store.c
+++ b/citadel/server/modules/imap/imap_store.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../sysdep_decls.h"
 #include "../../citserver.h"

diff --git a/citadel/server/modules/imap/imap_tools.c b/citadel/server/modules/imap/imap_tools.c
index 96cdfc518103c616aafbde7b405174c0dcbc48ff..8d910305d4bbcad4ec217e49e57a935ef4f4a3d0 100644 (file)
--- a/citadel/server/modules/imap/imap_tools.c
+++ b/citadel/server/modules/imap/imap_tools.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../sysdep_decls.h"
 #include "../../internet_addressing.h"
 #include "serv_imap.h"

diff --git a/citadel/server/modules/imap/serv_imap.c b/citadel/server/modules/imap/serv_imap.c
index 6334388d34b95bf8570bf7faecfcecde58266724..e492bc74faef77eb2f3385e8558b88827272daaf 100644 (file)
--- a/citadel/server/modules/imap/serv_imap.c
+++ b/citadel/server/modules/imap/serv_imap.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/inboxrules/serv_inboxrules.c b/citadel/server/modules/inboxrules/serv_inboxrules.c
index 1e1f8899a8ac38839fb91594fbb16b2bac41a359..72eabb635432f6aa9cca566864eb9ead27e95950 100644 (file)
--- a/citadel/server/modules/inboxrules/serv_inboxrules.c
+++ b/citadel/server/modules/inboxrules/serv_inboxrules.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/inetcfg/serv_inetcfg.c b/citadel/server/modules/inetcfg/serv_inetcfg.c
index de095a2f8c5ea1483817b8e10964c7cca4fb5589..52967030403c4bb8b7a9352297d031eb205a4bdb 100644 (file)
--- a/citadel/server/modules/inetcfg/serv_inetcfg.c
+++ b/citadel/server/modules/inetcfg/serv_inetcfg.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/instmsg/serv_instmsg.c b/citadel/server/modules/instmsg/serv_instmsg.c
index 6726e2355461742aad35fca1ff58057f736ec2db..9ac1a5e64741e6d087db460a20404363488f04d5 100644 (file)
--- a/citadel/server/modules/instmsg/serv_instmsg.c
+++ b/citadel/server/modules/instmsg/serv_instmsg.c
@@ -26,7 +26,7 @@
 #include <limits.h>
 #include <libcitadel.h>
 #include "../../sysdep.h"
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../context.h"
 #include "../../citserver.h"

diff --git a/citadel/server/modules/listdeliver/serv_listdeliver.c b/citadel/server/modules/listdeliver/serv_listdeliver.c
index 61df918cf69f405e8540d7aa3bb2e786787a4b92..dc8f43396bb4f8820fd05aa74eea57d17e8be27b 100644 (file)
--- a/citadel/server/modules/listdeliver/serv_listdeliver.c
+++ b/citadel/server/modules/listdeliver/serv_listdeliver.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/listsub/serv_listsub.c b/citadel/server/modules/listsub/serv_listsub.c
index 70f6174e35a79bd02f3c6529b6fa8eabe13ce3a6..72d407fef3e4ee56f4451c925d376eeea3801e7e 100644 (file)
--- a/citadel/server/modules/listsub/serv_listsub.c
+++ b/citadel/server/modules/listsub/serv_listsub.c
@@ -29,7 +29,7 @@
 #include <limits.h>
 #include <crypt.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/migrate/serv_migrate.c b/citadel/server/modules/migrate/serv_migrate.c
index 08568763f4c4c7a18b4693480bf35d2d1a3191f5..ffd615a48a56298b0c2413e44d974f4aa6fc4cc0 100644 (file)
--- a/citadel/server/modules/migrate/serv_migrate.c
+++ b/citadel/server/modules/migrate/serv_migrate.c
@@ -40,7 +40,7 @@
 #include <limits.h>
 #include <expat.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/newuser/serv_newuser.c b/citadel/server/modules/newuser/serv_newuser.c
index 37563c08ad354eba375717665131b5b4e5585372..a75686c2c99f0ac3b3811bf78e5359c50a179d13 100644 (file)
--- a/citadel/server/modules/newuser/serv_newuser.c
+++ b/citadel/server/modules/newuser/serv_newuser.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <limits.h>
 #include "../../ctdl_module.h"
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/nntp/serv_nntp.c b/citadel/server/modules/nntp/serv_nntp.c
index e2c7bd75daf3a6d8c7fdf12cccaa8c6f45a12244..ef305d50f45ad932ddf27e728dac35e2ba656d9d 100644 (file)
--- a/citadel/server/modules/nntp/serv_nntp.c
+++ b/citadel/server/modules/nntp/serv_nntp.c
@@ -32,7 +32,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/notes/serv_notes.c b/citadel/server/modules/notes/serv_notes.c
index 1351db3da369ac22502f948f31f60dc39b5bd486..f59bd8fe8bef509e9f31523e41ee72efd3826522 100644 (file)
--- a/citadel/server/modules/notes/serv_notes.c
+++ b/citadel/server/modules/notes/serv_notes.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/pop3/serv_pop3.c b/citadel/server/modules/pop3/serv_pop3.c
index 335968708ad5daf83db979e3f0eccef20fa80bf0..067c30435174ed35f4dd0ed9deb279080bdf7968 100644 (file)
--- a/citadel/server/modules/pop3/serv_pop3.c
+++ b/citadel/server/modules/pop3/serv_pop3.c
@@ -34,7 +34,7 @@
 #include <limits.h>
 #include <ctype.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/pop3client/serv_pop3client.c b/citadel/server/modules/pop3client/serv_pop3client.c
index 84c43f1735ecb70cfc855c34b6cffa775d36e9c8..78a498f438b7aea45be6fc6bd374017b7fa42e8d 100644 (file)
--- a/citadel/server/modules/pop3client/serv_pop3client.c
+++ b/citadel/server/modules/pop3client/serv_pop3client.c
@@ -17,7 +17,7 @@
 #include <curl/curl.h>
 #include <libcitadel.h>
 #include "../../sysconfig.h"
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/roomchat/serv_roomchat.c b/citadel/server/modules/roomchat/serv_roomchat.c
index 4adb1a492e5281497404e72235194eb8a727ed1e..91e21fca148e22ed5127f8a93325c3386db951c5 100644 (file)
--- a/citadel/server/modules/roomchat/serv_roomchat.c
+++ b/citadel/server/modules/roomchat/serv_roomchat.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/rssclient/serv_rssclient.c b/citadel/server/modules/rssclient/serv_rssclient.c
index 28afc5b1cbe6438622a8623a1ad964458e615755..07ea2e8181da82f6c8620a59c2751f1b3e333ba2 100644 (file)
--- a/citadel/server/modules/rssclient/serv_rssclient.c
+++ b/citadel/server/modules/rssclient/serv_rssclient.c
@@ -19,7 +19,7 @@
 #include <expat.h>
 #include <curl/curl.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/rwho/serv_rwho.c b/citadel/server/modules/rwho/serv_rwho.c
index d0f38ff1785c9a19bb7432b05807644d93322489..64a0e42fe9668c816e7c9a9b16e343c446cb81d6 100644 (file)
--- a/citadel/server/modules/rwho/serv_rwho.c
+++ b/citadel/server/modules/rwho/serv_rwho.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/smtp/serv_smtp.c b/citadel/server/modules/smtp/serv_smtp.c
index c30df54092da761153ea6b3b64f59cb60b415969..0c09e005f1b75066e3d7397b7fcadf4bd41587d1 100644 (file)
--- a/citadel/server/modules/smtp/serv_smtp.c
+++ b/citadel/server/modules/smtp/serv_smtp.c
@@ -50,7 +50,7 @@
 #include <arpa/inet.h>
 #include <assert.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/smtp/serv_smtpclient.c b/citadel/server/modules/smtp/serv_smtpclient.c
index 85ca6570cb20f20bd3e0fa9a7ffe50198a70334e..12c11098aff01009defed52f84982a4f83145de3 100644 (file)
--- a/citadel/server/modules/smtp/serv_smtpclient.c
+++ b/citadel/server/modules/smtp/serv_smtpclient.c
@@ -19,7 +19,7 @@
 #include <libcitadel.h>
 #include <curl/curl.h>
 #include "../../sysconfig.h"
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/smtp/smtp_util.c b/citadel/server/modules/smtp/smtp_util.c
index d62df945db7f7dce2607ed2fc294b650008c0668..27d239b647edc74220f70c7f636c78e0081e9838 100644 (file)
--- a/citadel/server/modules/smtp/smtp_util.c
+++ b/citadel/server/modules/smtp/smtp_util.c
@@ -32,7 +32,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/spam/serv_spam.c b/citadel/server/modules/spam/serv_spam.c
index 76a422d8524da1dbf82c2a16c02e4187203acf62..cc6272f310a5024342e5a67bbb39e84c721a808c 100644 (file)
--- a/citadel/server/modules/spam/serv_spam.c
+++ b/citadel/server/modules/spam/serv_spam.c
@@ -22,7 +22,7 @@
 #include <limits.h>
 #include <sys/socket.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/upgrade/serv_upgrade.c b/citadel/server/modules/upgrade/serv_upgrade.c
index c3fc9618fff09f99a71112936889404d3c0271cd..b84a4cbf38a75d515300204a8586a4967e0228ff 100644 (file)
--- a/citadel/server/modules/upgrade/serv_upgrade.c
+++ b/citadel/server/modules/upgrade/serv_upgrade.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/vcard/serv_vcard.c b/citadel/server/modules/vcard/serv_vcard.c
index 7dbeb4a911eaee64374b1edd1dfbdc676bbc628d..3ae7997321dd0324a0af1123978e830660eafb69 100644 (file)
--- a/citadel/server/modules/vcard/serv_vcard.c
+++ b/citadel/server/modules/vcard/serv_vcard.c
@@ -43,7 +43,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/wiki/serv_wiki.c b/citadel/server/modules/wiki/serv_wiki.c
index d547d2157c449b901dd941d8aee89becbbf7af76..6ab11651ba606a68dc54373f6a86738c38e03c7f 100644 (file)
--- a/citadel/server/modules/wiki/serv_wiki.c
+++ b/citadel/server/modules/wiki/serv_wiki.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <limits.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/xmpp/serv_xmpp.c b/citadel/server/modules/xmpp/serv_xmpp.c
index 13e8c17649731d02120601b503eeeeb530e074fd..9dacbffad865639f8172a470fb4f24ba723d9d74 100644 (file)
--- a/citadel/server/modules/xmpp/serv_xmpp.c
+++ b/citadel/server/modules/xmpp/serv_xmpp.c
@@ -33,7 +33,7 @@
 #include <ctype.h>
 #include <libcitadel.h>
 #include <expat.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/xmpp/xmpp_messages.c b/citadel/server/modules/xmpp/xmpp_messages.c
index 219f8efdda9017712a58a5e7f50c7da6898da4f4..211280ce328110a5af5c901bbabfa14ae5945ee6 100644 (file)
--- a/citadel/server/modules/xmpp/xmpp_messages.c
+++ b/citadel/server/modules/xmpp/xmpp_messages.c
@@ -28,7 +28,7 @@
 #include <ctype.h>
 #include <expat.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/xmpp/xmpp_presence.c b/citadel/server/modules/xmpp/xmpp_presence.c
index 0dc24322fd349ad999125004df9f1bbf809673af..0658a141c7cde383788e283bd5c19768abc67aa6 100644 (file)
--- a/citadel/server/modules/xmpp/xmpp_presence.c
+++ b/citadel/server/modules/xmpp/xmpp_presence.c
@@ -36,7 +36,7 @@
 #include <ctype.h>
 #include <expat.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/xmpp/xmpp_query_namespace.c b/citadel/server/modules/xmpp/xmpp_query_namespace.c
index 01b97686989f2eaae290a739a605f4613b0968d3..abff8cec0835902662438a0e18d8fd322b645633 100644 (file)
--- a/citadel/server/modules/xmpp/xmpp_query_namespace.c
+++ b/citadel/server/modules/xmpp/xmpp_query_namespace.c
@@ -28,7 +28,7 @@
 #include <ctype.h>
 #include <expat.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/xmpp/xmpp_queue.c b/citadel/server/modules/xmpp/xmpp_queue.c
index 175c7d9bc55c18c1fcbebbbcb4c24bdf50e4861d..b3c48616d4777e3cbd0837caa0886c2573222841 100644 (file)
--- a/citadel/server/modules/xmpp/xmpp_queue.c
+++ b/citadel/server/modules/xmpp/xmpp_queue.c
@@ -28,7 +28,7 @@
 #include <ctype.h>
 #include <expat.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/modules/xmpp/xmpp_sasl_service.c b/citadel/server/modules/xmpp/xmpp_sasl_service.c
index 494c0da1c50a490dbe1ef1e8b5e4fa2e7494ceca..28f3c6a355e798ef4775ce22e4280ee2259ddc78 100644 (file)
--- a/citadel/server/modules/xmpp/xmpp_sasl_service.c
+++ b/citadel/server/modules/xmpp/xmpp_sasl_service.c
@@ -30,7 +30,7 @@
 #include <ctype.h>
 #include <expat.h>
 #include <libcitadel.h>
-#include "../../citadel.h"
+#include "../../citadel_defs.h"
 #include "../../server.h"
 #include "../../citserver.h"
 #include "../../support.h"

diff --git a/citadel/server/server.h b/citadel/server/server.h
index 12616070d67e0b4a390fd02a63e5a616a9b8c440..09054b182b4e443b3c1f348caf875be1d608fa19 100644 (file)
--- a/citadel/server/server.h
+++ b/citadel/server/server.h
@@ -1,4 +1,4 @@
-// Main declarations file for the Citadel server
+// Data types for the Citadel Server
 //
 // Copyright (c) 1987-2023 by the citadel.org team
 //
@@ -14,7 +14,7 @@
 #define INLINE
 #endif
 
-#include "citadel.h"
+#include "citadel_defs.h"
 #ifdef HAVE_OPENSSL
 #define OPENSSL_NO_KRB5                        // work around redhat b0rken ssl headers
 #include <openssl/ssl.h>
@@ -319,6 +319,18 @@ struct ctdluser {                  // User record
 };
 
 
+// Message expiration policy stuff
+typedef struct ExpirePolicy ExpirePolicy;
+struct ExpirePolicy {
+       int expire_mode;
+       int expire_value;
+};
+
+#define EXPIRE_NEXTLEVEL       0       // Inherit expiration policy
+#define EXPIRE_MANUAL          1       // Don't expire messages at all
+#define EXPIRE_NUMMSGS         2       // Keep only latest n messages
+#define EXPIRE_AGE             3       // Expire messages after n days
+
 // Room records.
 struct ctdlroom {
        char QRname[ROOMNAMELEN];       // Name of room

diff --git a/citadel/server/support.c b/citadel/server/support.c
index 7410e7cc23f9179c8c9693c35b36e2e914590f09..6f9a0836d491e1ea8e45370990a3482d9e511907 100644 (file)
--- a/citadel/server/support.c
+++ b/citadel/server/support.c
@@ -9,7 +9,7 @@
 #include <sys/stat.h>
 #include <libcitadel.h>
 
-#include "citadel.h"
+#include "citadel_defs.h"
 #include "support.h"
 
 // strproc()  -  make a string 'nice'

diff --git a/citadel/utils/chkpw.c b/citadel/utils/chkpw.c
index 8c9dcb395efce64ebc14e925066e35e9f163a851..2db604e17f87e823fe48ba73efb7ef15cf240d3e 100644 (file)
--- a/citadel/utils/chkpw.c
+++ b/citadel/utils/chkpw.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <limits.h>
 #include <dirent.h>
-#include "../server/citadel.h"
+#include "../server/citadel_defs.h"
 #include "../server/server.h"
 #include "../server/sysdep.h"
 #include "../server/citadel_dirs.h"

diff --git a/citadel/utils/chkpwd.c b/citadel/utils/chkpwd.c
index 70baf53e765df14bdb2250251fed4ee97ac0df2d..d94bb8861420dbbcf6e12fdb5728056de90d0e91 100644 (file)
--- a/citadel/utils/chkpwd.c
+++ b/citadel/utils/chkpwd.c
@@ -17,7 +17,7 @@
 #include "auth.h"
 #include "../server/config.h"
 #include "../server/citadel_dirs.h"
-#include "../server/citadel.h"
+#include "../server/citadel_defs.h"
 
 
 int main(void) {

diff --git a/citadel/utils/citmail.c b/citadel/utils/citmail.c
index cff216f3e59a745d6890fdefbc9eb9171ffc2129..7d89d4ea64186e26a8a3a50d206f6370cd9a0fd5 100644 (file)
--- a/citadel/utils/citmail.c
+++ b/citadel/utils/citmail.c
@@ -24,7 +24,7 @@
 #include <limits.h>
 #include <libcitadel.h>
 #include "../server/sysdep.h"
-#include "../server/citadel.h"
+#include "../server/citadel_defs.h"
 #include "../server/server.h"
 #include "../server/citadel_dirs.h"
 

diff --git a/citadel/utils/ctdlmigrate.c b/citadel/utils/ctdlmigrate.c
index 19539ba37d13b2c46b6ed5eafa3bf626595f6142..6b1af0297aeb5ea2aab4effc4aa5a8029f78eae2 100644 (file)
--- a/citadel/utils/ctdlmigrate.c
+++ b/citadel/utils/ctdlmigrate.c
@@ -25,7 +25,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <libcitadel.h>
-#include "../server/citadel.h"
+#include "../server/citadel_defs.h"
 #include "axdefs.h"
 #include "../server/sysdep.h"
 #include "../server/config.h"

diff --git a/citadel/utils/sendcommand.c b/citadel/utils/sendcommand.c
index 6380f4eecb3a8d7ab8485bd5f7b6220716ee72f2..41547be9ecb2557eedee965eca7022093383062f 100644 (file)
--- a/citadel/utils/sendcommand.c
+++ b/citadel/utils/sendcommand.c
@@ -19,7 +19,7 @@
 #include <limits.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include "../server/citadel.h"
+#include "../server/citadel_defs.h"
 #include "../server/server.h"
 #include "../server/citadel_dirs.h"
 #include <libcitadel.h>

diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c
index 2acbc6ab5fa962d567149e466536476113159aec..84d1d958ca8d94283160e5fca20d4f89e53c0985 100644 (file)
--- a/citadel/utils/setup.c
+++ b/citadel/utils/setup.c
@@ -25,7 +25,7 @@
 #include <sys/un.h>
 #include <assert.h>
 #include <libcitadel.h>
-#include "../server/citadel.h"
+#include "../server/citadel_defs.h"
 #include "../server/server.h"
 #include "axdefs.h"
 #include "../server/sysdep.h"