#include <ctype.h>
#include <string.h>
#include <limits.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
#include "citadel.h"
#include "server.h"
#include "sysdep_decls.h"
#include "support.h"
#include "config.h"
#include "control.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "room_ops.h"
#include "user_ops.h"
#include "policy.h"
#include "genstamp.h"
#include "domain.h"
#include "clientsocket.h"
+#include "locate_host.h"
#ifndef HAVE_SNPRINTF
struct citsmtp { /* Information about the current session */
int command_state;
char helo_node[SIZ];
- struct usersupp vrfy_buffer;
+ struct ctdluser vrfy_buffer;
int vrfy_count;
char vrfy_match[SIZ];
char from[SIZ];
+ char recipients[SIZ];
int number_of_recipients;
int number_of_rooms;
int delivery_mode;
CtdlAllocUserData(SYM_SMTP, sizeof(struct citsmtp));
CtdlAllocUserData(SYM_SMTP_RECPS, SIZ);
CtdlAllocUserData(SYM_SMTP_ROOMS, SIZ);
- sprintf(SMTP_RECPS, "%s", "");
- sprintf(SMTP_ROOMS, "%s", "");
+ snprintf(SMTP_RECPS, SIZ, "%s", "");
+ snprintf(SMTP_ROOMS, SIZ, "%s", "");
cprintf("220 %s ESMTP Citadel/UX server ready.\r\n", config.c_fqdn);
}
cprintf("250-HELP\r\n");
cprintf("250-SIZE %ld\r\n", config.c_maxmsglen);
cprintf("250-PIPELINING\r\n");
- cprintf("250 AUTH=LOGIN\r\n");
+ cprintf("250-AUTH=LOGIN\r\n");
+ cprintf("250 ENHANCEDSTATUSCODES\r\n");
}
}
char buf[SIZ];
char username[SIZ];
- decode_base64(username, argbuf, SIZ);
+ CtdlDecodeBase64(username, argbuf, SIZ);
lprintf(9, "Trying <%s>\n", username);
if (CtdlLoginExistingUser(username) == login_ok) {
- encode_base64(buf, "Password:");
+ CtdlEncodeBase64(buf, "Password:", 9);
cprintf("334 %s\r\n", buf);
SMTP->command_state = smtp_password;
}
else {
- cprintf("500 No such user.\r\n");
+ cprintf("500 5.7.0 No such user.\r\n");
SMTP->command_state = smtp_command;
}
}
void smtp_get_pass(char *argbuf) {
char password[SIZ];
- decode_base64(password, argbuf, SIZ);
+ CtdlDecodeBase64(password, argbuf, SIZ);
lprintf(9, "Trying <%s>\n", password);
if (CtdlTryPassword(password) == pass_ok) {
- cprintf("235 Authentication successful.\r\n");
+ cprintf("235 2.0.0 Hello, %s\r\n", CC->user.fullname);
lprintf(9, "SMTP authenticated login successful\n");
CC->internal_pgm = 0;
CC->cs_flags &= ~CS_STEALTH;
}
else {
- cprintf("500 Authentication failed.\r\n");
+ cprintf("500 5.7.0 Authentication failed.\r\n");
}
SMTP->command_state = smtp_command;
}
char buf[SIZ];
if (strncasecmp(argbuf, "login", 5) ) {
- cprintf("550 We only support LOGIN authentication.\r\n");
+ cprintf("550 5.7.4 We only support LOGIN authentication.\r\n");
return;
}
}
else {
- encode_base64(buf, "Username:");
+ CtdlEncodeBase64(buf, "Username:", 9);
cprintf("334 %s\r\n", buf);
SMTP->command_state = smtp_user;
}
/*
* Back end for smtp_vrfy() command
*/
-void smtp_vrfy_backend(struct usersupp *us, void *data) {
+void smtp_vrfy_backend(struct ctdluser *us, void *data) {
if (!fuzzy_match(us, SMTP->vrfy_match)) {
++SMTP->vrfy_count;
- memcpy(&SMTP->vrfy_buffer, us, sizeof(struct usersupp));
+ memcpy(&SMTP->vrfy_buffer, us, sizeof(struct ctdluser));
}
}
ForEachUser(smtp_vrfy_backend, NULL);
if (SMTP->vrfy_count < 1) {
- cprintf("550 String does not match anything.\r\n");
+ cprintf("550 5.1.1 String does not match anything.\r\n");
}
else if (SMTP->vrfy_count == 1) {
cprintf("250 %s <cit%ld@%s>\r\n",
config.c_fqdn);
}
else if (SMTP->vrfy_count > 1) {
- cprintf("553 Request ambiguous: %d users matched.\r\n",
+ cprintf("553 5.1.4 Request ambiguous: %d users matched.\r\n",
SMTP->vrfy_count);
}
/*
* Back end for smtp_expn() command
*/
-void smtp_expn_backend(struct usersupp *us, void *data) {
+void smtp_expn_backend(struct ctdluser *us, void *data) {
if (!fuzzy_match(us, SMTP->vrfy_match)) {
}
++SMTP->vrfy_count;
- memcpy(&SMTP->vrfy_buffer, us, sizeof(struct usersupp));
+ memcpy(&SMTP->vrfy_buffer, us, sizeof(struct ctdluser));
}
}
ForEachUser(smtp_expn_backend, NULL);
if (SMTP->vrfy_count < 1) {
- cprintf("550 String does not match anything.\r\n");
+ cprintf("550 5.1.1 String does not match anything.\r\n");
}
else if (SMTP->vrfy_count >= 1) {
cprintf("250 %s <cit%ld@%s>\r\n",
*/
void smtp_rset(void) {
memset(SMTP, 0, sizeof(struct citsmtp));
- if (SMTP_RECPS != NULL) strcpy(SMTP_RECPS, "");
- if (SMTP_ROOMS != NULL) strcpy(SMTP_ROOMS, "");
- if (CC->logged_in) logout(CC);
- cprintf("250 Zap!\r\n");
+
+ /*
+ * It is somewhat ambiguous whether we want to log out when a RSET
+ * command is issued. Here's the code to do it. It is commented out
+ * because some clients (such as Pine) issue RSET commands before
+ * each message, but still expect to be logged in.
+ *
+ * if (CC->logged_in) {
+ * logout(CC);
+ * }
+ */
+
+ cprintf("250 2.0.0 Zap!\r\n");
}
/*
*/
void smtp_data_clear(void) {
strcpy(SMTP->from, "");
+ strcpy(SMTP->recipients, "");
SMTP->number_of_recipients = 0;
- SMTP->number_of_rooms = 0;
SMTP->delivery_mode = 0;
SMTP->message_originated_locally = 0;
- if (SMTP_RECPS != NULL) strcpy(SMTP_RECPS, "");
- if (SMTP_ROOMS != NULL) strcpy(SMTP_ROOMS, "");
}
void smtp_mail(char *argbuf) {
char user[SIZ];
char node[SIZ];
- int cvt;
+ char name[SIZ];
if (strlen(SMTP->from) != 0) {
- cprintf("503 Only one sender permitted\r\n");
+ cprintf("503 5.1.0 Only one sender permitted\r\n");
return;
}
if (strncasecmp(argbuf, "From:", 5)) {
- cprintf("501 Syntax error\r\n");
+ cprintf("501 5.1.7 Syntax error\r\n");
return;
}
strcpy(SMTP->from, &argbuf[5]);
striplt(SMTP->from);
+ stripallbut(SMTP->from, '<', '>');
+ /* We used to reject empty sender names, until it was brought to our
+ * attention that RFC1123 5.2.9 requires that this be allowed. So now
+ * we allow it, but replace the empty string with a fake
+ * address so we don't have to contend with the empty string causing
+ * other code to fail when it's expecting something there.
+ */
if (strlen(SMTP->from) == 0) {
- cprintf("501 Empty sender name is not permitted\r\n");
- return;
+ strcpy(SMTP->from, "someone@somewhere.org");
}
-
- /* If this SMTP connection is from a logged-in user, make sure that
- * the user only sends email from his/her own address.
+ /* If this SMTP connection is from a logged-in user, force the 'from'
+ * to be the user's Internet e-mail address as Citadel knows it.
*/
if (CC->logged_in) {
- cvt = convert_internet_address(user, node, SMTP->from);
- lprintf(9, "cvt=%d, citaddr=<%s@%s>\n", cvt, user, node);
- if ( (cvt != 0) || (strcasecmp(user, CC->usersupp.fullname))) {
- cprintf("550 <%s> is not your address.\r\n", SMTP->from);
- strcpy(SMTP->from, "");
- return;
- }
- else {
- SMTP->message_originated_locally = 1;
- }
+ strcpy(SMTP->from, CC->cs_inet_email);
+ cprintf("250 2.1.0 Sender ok <%s>\r\n", SMTP->from);
+ SMTP->message_originated_locally = 1;
+ return;
}
/* Otherwise, make sure outsiders aren't trying to forge mail from
* this system.
*/
else {
- cvt = convert_internet_address(user, node, SMTP->from);
- lprintf(9, "cvt=%d, citaddr=<%s@%s>\n", cvt, user, node);
- if (CtdlHostAlias(node) == hostalias_localhost) {
- cprintf("550 You must log in to send mail from %s\r\n",
+ process_rfc822_addr(SMTP->from, user, node, name);
+ if (CtdlHostAlias(node) != hostalias_nomatch) {
+ cprintf("550 5.1.8 "
+ "You must log in to send mail from %s\r\n",
node);
strcpy(SMTP->from, "");
return;
}
}
- cprintf("250 Sender ok\r\n");
+ cprintf("250 2.0.0 Sender ok\r\n");
}
* Implements the "RCPT To:" command
*/
void smtp_rcpt(char *argbuf) {
- int cvt;
- char user[SIZ];
- char node[SIZ];
char recp[SIZ];
+ char message_to_spammer[SIZ];
+ struct recptypes *valid = NULL;
if (strlen(SMTP->from) == 0) {
- cprintf("503 Need MAIL before RCPT\r\n");
+ cprintf("503 5.5.1 Need MAIL before RCPT\r\n");
return;
}
if (strncasecmp(argbuf, "To:", 3)) {
- cprintf("501 Syntax error\r\n");
+ cprintf("501 5.1.7 Syntax error\r\n");
return;
}
strcpy(recp, &argbuf[3]);
striplt(recp);
- alias(recp);
-
- cvt = convert_internet_address(user, node, recp);
- snprintf(recp, sizeof recp, "%s@%s", user, node);
- lprintf(9, "cvt=%d, citaddr=<%s@%s>\n", cvt, user, node);
-
- switch(cvt) {
- case rfc822_address_locally_validated:
- case rfc822_address_on_citadel_network:
- cprintf("250 %s is a valid recipient.\r\n", user);
- CtdlReallocUserData(SYM_SMTP_RECPS,
- strlen(SMTP_RECPS) + 1024 );
- if (strlen(SMTP_RECPS) > 0) {
- strcat(SMTP_RECPS, "|");
- }
- strcat(SMTP_RECPS, user);
- return;
-
- case rfc822_room_delivery:
- cprintf("250 Delivering to room '%s'\r\n", user);
- CtdlReallocUserData(SYM_SMTP_ROOMS,
- strlen(SMTP_ROOMS) + 1024 );
- if (strlen(SMTP_ROOMS) > 0) {
- strcat(SMTP_ROOMS, "|");
- }
- strcat(SMTP_RECPS, user);
- return;
-
- case rfc822_no_such_user:
- cprintf("550 %s: no such user\r\n", recp);
- return;
+ stripallbut(recp, '<', '>');
- case rfc822_address_nonlocal:
- if (SMTP->message_originated_locally == 0) {
- cprintf("551 Relaying denied.\r\n");
- }
- else {
- cprintf("250 Remote recipient %s ok\r\n", recp);
- CtdlReallocUserData(SYM_SMTP_RECPS,
- strlen(SMTP_RECPS) + 1024 );
- if (strlen(SMTP_RECPS) > 0) {
- strcat(SMTP_RECPS, "|");
- }
- strcat(SMTP_RECPS, user);
- return;
- }
- return;
+ if ( (strlen(recp) + strlen(SMTP->recipients) + 1 ) >= SIZ) {
+ cprintf("452 4.5.3 Too many recipients\r\n");
+ return;
}
- cprintf("599 Unknown error\r\n");
-}
-
-
-
-/*
- * Back end for smtp_data() ... this does the actual delivery of the message
- * Returns 0 on success, nonzero on failure
- */
-int smtp_message_delivery(struct CtdlMessage *msg) {
- char user[1024];
- char node[1024];
- char name[1024];
- char buf[1024];
- char dtype[1024];
- char room[1024];
- int successful_saves = 0; /* number of successful local saves */
- int failed_saves = 0; /* number of failed deliveries */
- int remote_spools = 0; /* number of copies to send out */
- long msgid = (-1L);
- int i;
- struct usersupp userbuf;
- char *instr; /* Remote delivery instructions */
- struct CtdlMessage *imsg;
- struct recptypes *valid;
-
- lprintf(9, "smtp_message_delivery() called\n");
-
- /* Fill in 'from' fields with envelope information if missing */
- process_rfc822_addr(SMTP->from, user, node, name);
- if (msg->cm_fields['A']==NULL) msg->cm_fields['A'] = strdoop(user);
- if (msg->cm_fields['N']==NULL) msg->cm_fields['N'] = strdoop(node);
- if (msg->cm_fields['H']==NULL) msg->cm_fields['H'] = strdoop(name);
- if (msg->cm_fields['O']==NULL) msg->cm_fields['O'] = strdoop(MAILROOM);
-
- /* Save the message in the queue */
- msgid = CtdlSubmitMsg(msg,
- NULL,
- SMTP_SPOOLOUT_ROOM);
- ++successful_saves;
-
- valid = validate_recipients(char *recipients) ;
-
- for (i=0; i<SMTP->number_of_recipients; ++i) {
- extract_token(buf, SMTP_RECP, i, '\n');
- extract(dtype, buf, 0);
-
- /* Stuff local mailboxes */
- if (!strcasecmp(dtype, "local")) {
- extract(user, buf, 1);
- if (getuser(&userbuf, user) == 0) {
- MailboxName(room, &userbuf, MAILROOM);
- CtdlSaveMsgPointerInRoom(room, msgid, 0);
- ++successful_saves;
- }
- else {
- ++failed_saves;
- }
- }
-
- /* Delivery to local non-mailbox rooms */
- if (!strcasecmp(dtype, "room")) {
- extract(room, buf, 1);
- CtdlSaveMsgPointerInRoom(room, msgid, 0);
- ++successful_saves;
- }
-
- /* Delivery over the local Citadel network (IGnet) */
- if (!strcasecmp(dtype, "ignet")) {
- extract(user, buf, 1);
- extract(node, buf, 2);
- smtp_deliver_ignet(msg, user, node);
- }
-
- /* Remote delivery */
- if (!strcasecmp(dtype, "remote")) {
- extract(user, buf, 1);
- instr = reallok(instr, strlen(instr) + 1024);
- snprintf(&instr[strlen(instr)],
- strlen(instr) + 1024,
- "remote|%s|0\n",
- user);
- ++remote_spools;
+ /* RBL check */
+ if ( (!CC->logged_in) && (!CC->is_local_socket) ) {
+ if (rbl_check(message_to_spammer)) {
+ cprintf("550 %s\r\n", message_to_spammer);
+ /* no need to phree(valid), it's not allocated yet */
+ return;
}
-
}
- /* If there are remote spools to be done, save the instructions */
- if (remote_spools > 0) {
- imsg = mallok(sizeof(struct CtdlMessage));
- memset(imsg, 0, sizeof(struct CtdlMessage));
- imsg->cm_magic = CTDLMESSAGE_MAGIC;
- imsg->cm_anon_type = MES_NORMAL;
- imsg->cm_format_type = FMT_RFC822;
- imsg->cm_fields['M'] = instr;
- CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM);
- CtdlFreeMessage(imsg);
+ valid = validate_recipients(recp);
+ if (valid->num_error > 0) {
+ cprintf("599 5.1.1 Error: %s\r\n", valid->errormsg);
+ phree(valid);
+ return;
}
- /* If there are no remote spools, delete the message */
- else {
- phree(instr); /* only needed here, because CtdlSubmitMsg()
- * would free this buffer otherwise */
- CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, msgid, "");
+ if (valid->num_internet > 0) {
+ if (SMTP->message_originated_locally == 0) {
+ cprintf("551 5.7.1 <%s> - relaying denied\r\n", recp);
+ phree(valid);
+ return;
+ }
}
- return(failed_saves);
+ cprintf("250 2.1.5 RCPT ok <%s>\r\n", recp);
+ if (strlen(SMTP->recipients) > 0) {
+ strcat(SMTP->recipients, ",");
+ }
+ strcat(SMTP->recipients, recp);
+ SMTP->number_of_recipients += 1;
}
+
/*
* Implements the DATA command
*/
void smtp_data(void) {
char *body;
struct CtdlMessage *msg;
- int retval;
+ long msgnum;
char nowstamp[SIZ];
+ struct recptypes *valid;
+ int scan_errors;
if (strlen(SMTP->from) == 0) {
- cprintf("503 Need MAIL command first.\r\n");
+ cprintf("503 5.5.1 Need MAIL command first.\r\n");
return;
}
if (SMTP->number_of_recipients < 1) {
- cprintf("503 Need RCPT command first.\r\n");
+ cprintf("503 5.5.1 Need RCPT command first.\r\n");
return;
}
- cprintf("354 Transmit message now; terminate with '.' by itself\r\n");
+ cprintf("354 Transmit message now - terminate with '.' by itself\r\n");
- datestring(nowstamp, time(NULL), DATESTRING_RFC822);
+ datestring(nowstamp, sizeof nowstamp, time(NULL), DATESTRING_RFC822);
body = mallok(4096);
if (body != NULL) snprintf(body, 4096,
- "Received: from %s\n"
- " by %s;\n"
- " %s\n",
+ "Received: from %s (%s [%s])\n"
+ " by %s; %s\n",
SMTP->helo_node,
+ CC->cs_host,
+ CC->cs_addr,
config.c_fqdn,
nowstamp);
- body = CtdlReadMessageBody(".", config.c_maxmsglen, body);
+ body = CtdlReadMessageBody(".", config.c_maxmsglen, body, 1);
if (body == NULL) {
- cprintf("550 Unable to save message: internal error.\r\n");
+ cprintf("550 5.6.5 "
+ "Unable to save message: internal error.\r\n");
return;
}
/* If the user is locally authenticated, FORCE the From: header to
* show up as the real sender. Yes, this violates the RFC standard,
- * but IT MAKES SENSE. Comment it out if you don't like this behavior.
+ * but IT MAKES SENSE. If you prefer strict RFC adherence over
+ * common sense, you can disable this in the configuration.
+ *
+ * We also set the "message room name" ('O' field) to MAILROOM
+ * (which is Mail> on most systems) to prevent it from getting set
+ * to something ugly like "0000058008.Sent Items>" when the message
+ * is read with a Citadel client.
*/
- if (CC->logged_in) {
+ if ( (CC->logged_in) && (config.c_rfc822_strict_from == 0) ) {
if (msg->cm_fields['A'] != NULL) phree(msg->cm_fields['A']);
if (msg->cm_fields['N'] != NULL) phree(msg->cm_fields['N']);
if (msg->cm_fields['H'] != NULL) phree(msg->cm_fields['H']);
- msg->cm_fields['A'] = strdoop(CC->usersupp.fullname);
+ if (msg->cm_fields['F'] != NULL) phree(msg->cm_fields['F']);
+ if (msg->cm_fields['O'] != NULL) phree(msg->cm_fields['O']);
+ msg->cm_fields['A'] = strdoop(CC->user.fullname);
msg->cm_fields['N'] = strdoop(config.c_nodename);
msg->cm_fields['H'] = strdoop(config.c_humannode);
+ msg->cm_fields['F'] = strdoop(CC->cs_inet_email);
+ msg->cm_fields['O'] = strdoop(MAILROOM);
}
/* Submit the message into the Citadel system. */
- retval = smtp_message_delivery(msg);
- CtdlFreeMessage(msg);
+ valid = validate_recipients(SMTP->recipients);
+
+ /* If there are modules that want to scan this message before final
+ * submission (such as virus checkers or spam filters), call them now
+ * and give them an opportunity to reject the message.
+ */
+ scan_errors = PerformMessageHooks(msg, EVT_SMTPSCAN);
+
+ if (scan_errors > 0) { /* We don't want this message! */
- if (!retval) {
- cprintf("250 Message accepted.\r\n");
+ if (msg->cm_fields['0'] == NULL) {
+ msg->cm_fields['0'] = strdoop(
+ "5.7.1 Message rejected by filter");
+ }
+
+ cprintf("550 %s\r\n", msg->cm_fields['0']);
}
- else {
- cprintf("550 Internal delivery errors: %d\r\n", retval);
+
+ else { /* Ok, we'll accept this message. */
+ msgnum = CtdlSubmitMsg(msg, valid, "");
+ if (msgnum > 0L) {
+ cprintf("250 2.0.0 Message accepted.\r\n");
+ }
+ else {
+ cprintf("550 5.5.0 Internal delivery error\r\n");
+ }
}
+ CtdlFreeMessage(msg);
+ phree(valid);
smtp_data_clear(); /* clear out the buffers now */
}
CC->kill_me = 1;
return;
}
- lprintf(5, "citserver[%3d]: %s\n", CC->cs_pid, cmdbuf);
+ lprintf(5, "SMTP: %s\n", cmdbuf);
while (strlen(cmdbuf) < 5) strcat(cmdbuf, " ");
+ lprintf(9, "CC->logged_in = %d\n", CC->logged_in);
+
if (SMTP->command_state == smtp_user) {
smtp_get_user(cmdbuf);
}
}
else {
- cprintf("502 I'm afraid I can't do that.\r\n");
+ cprintf("502 5.0.0 I'm afraid I can't do that.\r\n");
}
}
* Called by smtp_do_procmsg() to attempt delivery to one SMTP host
*
*/
-void smtp_try(char *key, char *addr, int *status, char *dsn, long msgnum)
+void smtp_try(const char *key, const char *addr, int *status,
+ char *dsn, size_t n, long msgnum)
{
int sock = (-1);
char mxhosts[1024];
msg_fp = tmpfile();
if (msg_fp == NULL) {
*status = 4;
- sprintf(dsn, "Error creating temporary file");
+ snprintf(dsn, n, "Error creating temporary file");
return;
}
else {
CtdlRedirectOutput(msg_fp, -1);
- CtdlOutputMsg(msgnum, MT_RFC822, 0, 0, 1);
+ CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1);
CtdlRedirectOutput(NULL, -1);
fseek(msg_fp, 0L, SEEK_END);
msg_size = ftell(msg_fp);
if (mailfrom[i] == '<') lp = i;
if (mailfrom[i] == '>') rp = i;
}
- if ((lp>=0)&&(rp>lp)) {
+ if ( (lp>=0) && (rp>lp) ) {
mailfrom[rp] = 0;
strcpy(mailfrom, &mailfrom[lp]);
}
} while (scan_done == 0);
if (strlen(mailfrom)==0) strcpy(mailfrom, "someone@somewhere.org");
-
/* Figure out what mail exchanger host we have to connect to */
num_mxhosts = getmx(mxhosts, node);
lprintf(9, "Number of MX hosts for <%s> is %d\n", node, num_mxhosts);
return;
}
- for (mx=0; mx<num_mxhosts; ++mx) {
+ sock = (-1);
+ for (mx=0; (mx<num_mxhosts && sock < 0); ++mx) {
extract(buf, mxhosts, mx);
lprintf(9, "Trying <%s>\n", buf);
sock = sock_connect(buf, "25", "tcp");
snprintf(dsn, SIZ, "Could not connect: %s", strerror(errno));
if (sock >= 0) lprintf(9, "Connected!\n");
if (sock < 0) snprintf(dsn, SIZ, "%s", strerror(errno));
- if (sock >= 0) break;
}
if (sock < 0) {
time_t submitted = 0L;
struct CtdlMessage *bmsg = NULL;
int give_up = 0;
- int mes_type = 0;
+ struct recptypes *valid;
+ int successful_bounce = 0;
lprintf(9, "smtp_do_bounce() called\n");
strcpy(bounceto, "");
/*
* Now go through the instructions checking for stuff.
*/
-
for (i=0; i<lines; ++i) {
extract_token(buf, instr, i, '\n');
extract(key, buf, 0);
/* First try the user who sent the message */
lprintf(9, "bounce to user? <%s>\n", bounceto);
- TRACE;
if (strlen(bounceto) == 0) {
lprintf(7, "No bounce address specified\n");
bounce_msgid = (-1L);
}
-/* FIXME this won't work
- else if (mes_type = alias(bounceto), mes_type == MES_ERROR) {
- lprintf(7, "Invalid bounce address <%s>\n", bounceto);
- bounce_msgid = (-1L);
+
+ /* Can we deliver the bounce to the original sender? */
+ valid = validate_recipients(bounceto);
+ if (valid != NULL) {
+ if (valid->num_error == 0) {
+ CtdlSubmitMsg(bmsg, valid, "");
+ successful_bounce = 1;
+ }
}
- else {
- bounce_msgid = CtdlSubmitMsg(bmsg,
- bounceto,
- "", mes_type);
+
+ /* If not, post it in the Aide> room */
+ if (successful_bounce == 0) {
+ CtdlSubmitMsg(bmsg, NULL, config.c_aideroom);
}
- */
- TRACE;
- /* Otherwise, go to the Aide> room */
- lprintf(9, "bounce to room?\n");
- if (bounce_msgid < 0L) bounce_msgid = CtdlSubmitMsg(bmsg,
- NULL, AIDEROOM);
+ /* Free up the memory we used */
+ if (valid != NULL) {
+ phree(valid);
+ }
}
CtdlFreeMessage(bmsg);
extract(dsn, buf, 3);
if ( (!strcasecmp(key, "remote"))
&& ((status==0)||(status==3)||(status==4)) ) {
+
+ /* Remove this "remote" instruction from the set,
+ * but replace the set's final newline if
+ * remove_token() stripped it. It has to be there.
+ */
remove_token(instr, i, '\n');
+ if (instr[strlen(instr)-1] != '\n') {
+ strcat(instr, "\n");
+ }
+
--i;
--lines;
lprintf(9, "SMTP: Trying <%s>\n", addr);
- smtp_try(key, addr, &status, dsn, text_msgid);
+ smtp_try(key, addr, &status, dsn, sizeof dsn, text_msgid);
if (status != 2) {
if (results == NULL) {
results = mallok(1024);
results = reallok(results,
strlen(results) + 1024);
}
- sprintf(&results[strlen(results)],
+ snprintf(&results[strlen(results)], 1024,
"%s|%s|%d|%s\n",
key, addr, status, dsn);
}
*/
lprintf(7, "SMTP: processing outbound queue\n");
- if (getroom(&CC->quickroom, SMTP_SPOOLOUT_ROOM) != 0) {
+ if (getroom(&CC->room, SMTP_SPOOLOUT_ROOM) != 0) {
lprintf(3, "Cannot find room <%s>\n", SMTP_SPOOLOUT_ROOM);
return;
}
- CtdlForEachMessage(MSGS_ALL, 0L, (-127),
+ CtdlForEachMessage(MSGS_ALL, 0L,
SPOOLMIME, NULL, smtp_do_procmsg, NULL);
lprintf(7, "SMTP: queue run completed\n");
else if (!strcasecmp(cmd, "runqueue")) {
run_queue_now = 1;
- cprintf("%d All outbound SMTP will be retried now.\n", OK);
+ cprintf("%d All outbound SMTP will be retried now.\n", CIT_OK);
return;
}
}
+/*
+ * Initialize the SMTP outbound queue
+ */
+void smtp_init_spoolout(void) {
+ struct ctdlroom qrbuf;
+
+ /*
+ * Create the room. This will silently fail if the room already
+ * exists, and that's perfectly ok, because we want it to exist.
+ */
+ create_room(SMTP_SPOOLOUT_ROOM, 3, "", 0, 1, 0);
+
+ /*
+ * Make sure it's set to be a "system room" so it doesn't show up
+ * in the <K>nown rooms list for Aides.
+ */
+ if (lgetroom(&qrbuf, SMTP_SPOOLOUT_ROOM) == 0) {
+ qrbuf.QRflags2 |= QR2_SYSTEM;
+ lputroom(&qrbuf);
+ }
+}
+
+
/*****************************************************************************/
/*****************************************************************************/
-char *Dynamic_Module_Init(void)
+char *serv_smtp_init(void)
{
SYM_SMTP = CtdlGetDynamicSymbol();
- SYM_SMTP_RECP = CtdlGetDynamicSymbol();
CtdlRegisterServiceHook(config.c_smtp_port, /* On the net... */
NULL,
smtp_greeting,
smtp_command_loop);
- create_room(SMTP_SPOOLOUT_ROOM, 3, "", 0, 1);
+ smtp_init_spoolout();
CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER);
CtdlRegisterProtoHook(cmd_smtp, "SMTP", "SMTP utility commands");
return "$Id$";
projects / citadel.git / blobdiff