* 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.
-#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 */
int run_queue_now = 0; /* Set to 1 to ignore SMTP send retry times */
CC->internal_pgm = 1;
CC->cs_flags |= CS_STEALTH;
SMTP = malloc(sizeof(struct citsmtp));
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, 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
SMTP->is_msa = is_msa;
/* If this config option is set, reject connections from problem
- 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;
}
if (status == 5) bounce_this = 1;
if (give_up) bounce_this = 1;
}
- if (
- (!strcasecmp(key, "local"))
- || (!strcasecmp(key, "remote"))
- || (!strcasecmp(key, "ignet"))
- || (!strcasecmp(key, "room"))
- ) {
+ if (!strcasecmp(key, "remote")) {
if (status == 2) completed = 1;
else ++incomplete;
}
if (status == 2) completed = 1;
else ++incomplete;
}
lprintf(CTDL_DEBUG, "Performing SMTP cleanup hook\n");
free(SMTP);
lprintf(CTDL_DEBUG, "Performing SMTP cleanup hook\n");
free(SMTP);
- free(SMTP_ROOMS);
- free(SMTP_RECPS);
struct citpop3 *POP3;
struct citsmtp *SMTP;
struct citmgsve *MGSVE; /**< Managesieve Session struct */
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 */
};
struct cit_ical *CIT_ICAL; /* calendaring data */
struct ma_info *ma; /* multipart/alternative data */
};
Citadel, or an Internet e-mail address.
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:
INSTRUCTION: remote
SYNTAX: remote|friko@mumjiboolean.com|0|delivery status message
DESCRIPTION:
should be placed in the fourth field so that a bounce message may
be generated.
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.