X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver.h;h=ef7b4aa84e0eb3fadfe8912159039df030b04d8b;hb=fe70bc8314205d9c32da7c73e5bf1c58ee1a67f6;hp=e5e64539c0a7f6ca1012414b61ebc522c7c05c75;hpb=425c3723bd35cf6e2048027e36c721a78784b8c7;p=citadel.git

diff --git a/citadel/server.h b/citadel/server.h
index e5e64539c..ef7b4aa84 100644
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -44,7 +44,7 @@ struct CtdlMessage {
 
 
 /* Data structure returned by validate_recipients() */
-typedef struct __recptypes {
+struct recptypes {
 	int recptypes_magic;
         int num_local;
         int num_internet;
@@ -60,7 +60,7 @@ typedef struct __recptypes {
 	char *bounce_to;
 	char *envelope_from;
 	char *sending_room;
-} recptypes;
+};
 
 #define RECPTYPES_MAGIC 0xfeeb
 
@@ -72,9 +72,7 @@ typedef struct __recptypes {
  * restart.
  */
 #define CTDLEXIT_CONFIG		101	// Could not read system configuration
-#define CTDLEXIT_CONTROL	102	// Could not acquire lock
 #define CTDLEXIT_HOME		103	// Citadel home directory not found
-#define CTDLEXIT_OOD		104	// Out Of Date config - rerun setup
 #define CTDLEXIT_DB		105	// Unable to initialize database
 #define CTDLEXIT_LIBCITADEL	106	// Incorrect version of libcitadel
 #define CTDL_EXIT_UNSUP_AUTH	107	// Unsupported auth mode configured
@@ -104,7 +102,6 @@ enum {
 	KILLME_MALLOC_FAILED,
 	KILLME_QUOTA,
 	KILLME_READ_FAILED,
-	KILLME_ILLEGAL_MANAGESIEVE_COMMAND,
 	KILLME_SPAMMER,
 	KILLME_XML_PARSER
 };
@@ -150,8 +147,6 @@ enum {
 	S_FLOORCACHE,
 	S_ATBF,
 	S_JOURNAL_QUEUE,
-	S_RPLIST,
-	S_SIEVELIST,
 	S_CHKPWD,
 	S_LOG,
 	S_NETSPOOL,
@@ -234,7 +229,6 @@ struct cdbdata {
 #define EVT_PURGEUSER	100	/* Deleting a user */
 #define EVT_NEWUSER	102	/* Creating a user */
 
-#define EVT_BEFOREREAD	200
 #define EVT_BEFORESAVE	201
 #define EVT_AFTERSAVE	202
 #define EVT_SMTPSCAN	203	/* called before submitting a msg from SMTP */
@@ -306,6 +300,10 @@ struct UseTable {
 	time_t ut_timestamp;
 };
 
+
+/*
+ * These one-byte field headers are found in the Citadel message store.
+ */
 typedef enum _MsgField {
 	eAuthor       = 'A',
 	eBig_message  = 'B',