Removed some outdated cruft from the SMTP queue handler:

* In the per-session data structures, CC->SMTP_RECPS and CC->SMTP_ROOMS
  are not used for anything, so they have been deleted
* Removed all recipient types other than remote because they
  aren't used -- non-SMTP recipients don
  don't go through this queue.

diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index 21934d256d361c812a7321785ee1d30292295b19..e8fcf69bc56074c294cfa13cc4a71149651e0bbb 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -107,8 +107,6 @@ enum {                              /* Command states for login authentication */
 };
 
 #define SMTP           CC->SMTP
-#define SMTP_RECPS     CC->SMTP_RECPS
-#define SMTP_ROOMS     CC->SMTP_ROOMS
 
 
 int run_queue_now = 0; /* Set to 1 to ignore SMTP send retry times */
@@ -131,11 +129,7 @@ void smtp_greeting(int is_msa)
        CC->internal_pgm = 1;
        CC->cs_flags |= CS_STEALTH;
        SMTP = malloc(sizeof(struct citsmtp));
-       SMTP_RECPS = malloc(SIZ);
-       SMTP_ROOMS = malloc(SIZ);
        memset(SMTP, 0, sizeof(struct citsmtp));
-       memset(SMTP_RECPS, 0, SIZ);
-       memset(SMTP_ROOMS, 0, SIZ);
        SMTP->is_msa = is_msa;
 
        /* If this config option is set, reject connections from problem
@@ -1455,12 +1449,7 @@ void smtp_do_bounce(char *instr) {
                        omsgid = atol(addr);
                }
 
-               if (
-                  (!strcasecmp(key, "local"))
-                  || (!strcasecmp(key, "remote"))
-                  || (!strcasecmp(key, "ignet"))
-                  || (!strcasecmp(key, "room"))
-               ) {
+               if (!strcasecmp(key, "remote")) {
                        if (status == 5) bounce_this = 1;
                        if (give_up) bounce_this = 1;
                }
@@ -1579,12 +1568,7 @@ int smtp_purge_completed_deliveries(char *instr) {
 
                completed = 0;
 
-               if (
-                  (!strcasecmp(key, "local"))
-                  || (!strcasecmp(key, "remote"))
-                  || (!strcasecmp(key, "ignet"))
-                  || (!strcasecmp(key, "room"))
-               ) {
+               if (!strcasecmp(key, "remote")) {
                        if (status == 2) completed = 1;
                        else ++incomplete;
                }
@@ -1898,8 +1882,6 @@ void smtp_cleanup_function(void) {
 
        lprintf(CTDL_DEBUG, "Performing SMTP cleanup hook\n");
        free(SMTP);
-       free(SMTP_ROOMS);
-       free(SMTP_RECPS);
 }
 
 

diff --git a/citadel/server.h b/citadel/server.h
index 19eb12a2a1b722a4e06a197fa134166207223a60..6f18e9554b3361b92bda086cb4365921a537460c 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -140,8 +140,6 @@ struct CitContext {
        struct citpop3 *POP3;
        struct citsmtp *SMTP;
        struct citmgsve *MGSVE; /**< Managesieve Session struct */
-       char *SMTP_RECPS;
-       char *SMTP_ROOMS;
        struct cit_ical *CIT_ICAL;              /* calendaring data */
        struct ma_info *ma;                     /* multipart/alternative data */
 };

diff --git a/citadel/techdoc/delivery-list.txt b/citadel/techdoc/delivery-list.txt
index 9395c9442ee43198516bee85e925b2eca98b4f8a..1dcad79c0d8c9fe0a7adc7954413730c080f12d7 100644 (file)
--- a/citadel/techdoc/delivery-list.txt
+++ b/citadel/techdoc/delivery-list.txt
@@ -68,21 +68,6 @@ fails).
     Citadel, or an Internet e-mail address.
  
  
- INSTRUCTION:  local
- SYNTAX:       local|Friko Mumjiboolean|0
- DESCRIPTION:
-    Indicates the name of a recipient on the local system to which the
-    message must be delivered.  Almost never seen because most code delivers
-    directly.
- 
- 
- INSTRUCTION:  room
- SYNTAX:       room|Lobby|0
- DESCRIPTION:
-    Indicates the name of a room on the local system to which the message
-    must be copied.  Same implications as 'local'.
- 
- 
  INSTRUCTION:  remote
  SYNTAX:       remote|friko@mumjiboolean.com|0|delivery status message
  DESCRIPTION:
@@ -95,9 +80,3 @@ fails).
            should be placed in the fourth field so that a bounce message may
            be generated.
  
- 
- INSTRUCTION:  ignet
- SYNTAX:       ignet|uncnsrd|Lobby|0|delivery status message
- DESCRIPTION:
-    Names a room on another Citadel node to which this message needs to be
-    spooled over the network.