X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver.h;h=0be145a2003095bf0f970fcebc5cd0f55d80222c;hb=882ff5a53c3b4e440520a073cf07dc60b2671876;hp=cc262d51de035705242a83c82447777811bba2cc;hpb=50ff39d933b7178377b3a67f8edc31ffa42ffd28;p=citadel.git

diff --git a/citadel/server.h b/citadel/server.h
index cc262d51d..0be145a20 100644
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -1,7 +1,7 @@
 /* 
  * Main declarations file for the Citadel server
  *
- * 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.
@@ -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
 
@@ -104,7 +104,6 @@ enum {
 	KILLME_MALLOC_FAILED,
 	KILLME_QUOTA,
 	KILLME_READ_FAILED,
-	KILLME_ILLEGAL_MANAGESIEVE_COMMAND,
 	KILLME_SPAMMER,
 	KILLME_XML_PARSER
 };
@@ -150,8 +149,6 @@ enum {
 	S_FLOORCACHE,
 	S_ATBF,
 	S_JOURNAL_QUEUE,
-	S_RPLIST,
-	S_SIEVELIST,
 	S_CHKPWD,
 	S_LOG,
 	S_NETSPOOL,
@@ -234,7 +231,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,24 +302,23 @@ 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',
-	eRemoteRoom   = 'C',
-	eDestination  = 'D',
 	eExclusiveID  = 'E',
 	erFc822Addr   = 'F',
-	eHumanNode    = 'H',
 	emessageId    = 'I',
 	eJournal      = 'J',
 	eReplyTo      = 'K',
 	eListID       = 'L',
 	eMesageText   = 'M',
-	eNodeName     = 'N',
 	eOriginalRoom = 'O',
 	eMessagePath  = 'P',
 	eRecipient    = 'R',
-	eSpecialField = 'S',
 	eTimestamp    = 'T',
 	eMsgSubject   = 'U',
 	eenVelopeTo   = 'V',