Found another vestige of ignet to remove

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index c838085aa829b7fe394801c5775c75389b0fca02..aa038f47f51d058641c5caff654b290f80dd7535 100644 (file)
--- 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-2022 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,11 +44,10 @@ struct CtdlMessage {
 
 
 /* Data structure returned by validate_recipients() */
-typedef struct __recptypes {
+struct recptypes {
        int recptypes_magic;
         int num_local;
         int num_internet;
-        int num_ignet;
        int num_room;
         int num_error;
        char *errormsg;
@@ -60,7 +59,7 @@ typedef struct __recptypes {
        char *bounce_to;
        char *envelope_from;
        char *sending_room;
-} recptypes;
+};
 
 #define RECPTYPES_MAGIC 0xfeeb
 
@@ -72,9 +71,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 +101,6 @@ enum {
        KILLME_MALLOC_FAILED,
        KILLME_QUOTA,
        KILLME_READ_FAILED,
-       KILLME_ILLEGAL_MANAGESIEVE_COMMAND,
        KILLME_SPAMMER,
        KILLME_XML_PARSER
 };
@@ -147,12 +143,9 @@ enum {
        S_HOUSEKEEPING,
        S_DIRECTORY,
        S_NETCONFIGS,
-       S_PUBLIC_CLIENTS,
        S_FLOORCACHE,
        S_ATBF,
        S_JOURNAL_QUEUE,
-       S_RPLIST,
-       S_SIEVELIST,
        S_CHKPWD,
        S_LOG,
        S_NETSPOOL,
@@ -161,6 +154,7 @@ enum {
        S_SINGLE_USER,
        S_LDAP,
        S_IM_LOGS,
+       S_OPENSSL,
        MAX_SEMAPHORES
 };
 
@@ -235,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 */
@@ -307,24 +300,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',