X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtp.c;h=2680d908cfdc2e681c0f14af8c9b17392bd144fc;hb=8c47559cb5ae97ec0fa35660ee16fd61a9451c72;hp=77b2618ea055df4b82f474e6db1205d138ba1540;hpb=2ed96d7a59a16ca0ebb5707f32044dc411bde25a;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index 77b2618ea..2680d908c 100644
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -7,12 +7,10 @@
  * RFC  821 - Simple Mail Transfer Protocol
  * RFC  876 - Survey of SMTP Implementations
  * RFC 1047 - Duplicate messages and SMTP
- * RFC 1854 - command pipelining
+ * RFC 1652 - 8 bit MIME
  * RFC 1869 - Extended Simple Mail Transfer Protocol
  * RFC 1870 - SMTP Service Extension for Message Size Declaration
- * RFC 1893 - Enhanced Mail System Status Codes
  * RFC 2033 - Local Mail Transfer Protocol
- * RFC 2034 - SMTP Service Extension for Returning Enhanced Error Codes
  * RFC 2197 - SMTP Service Extension for Command Pipelining
  * RFC 2476 - Message Submission
  * RFC 2487 - SMTP Service Extension for Secure SMTP over TLS
@@ -24,6 +22,21 @@
  * The VRFY and EXPN commands have been removed from this implementation
  * because nobody uses these commands anymore, except for spammers.
  *
+ * Copyright (c) 1998-2009 by the citadel.org team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -136,7 +149,10 @@ void smtp_greeting(int is_msa)
 	 */
 	if ( (config.c_rbl_at_greeting) && (SMTP->is_msa == 0) ) {
 		if (rbl_check(message_to_spammer)) {
-			cprintf("550 %s\r\n", message_to_spammer);
+			if (CtdlThreadCheckStop())
+				cprintf("421 %s\r\n", message_to_spammer);
+			else
+				cprintf("550 %s\r\n", message_to_spammer);
 			CC->kill_me = 1;
 			/* no need to free_recipients(valid), it's not allocated yet */
 			return;
@@ -212,8 +228,8 @@ void lmtp_unfiltered_greeting(void) {
  * Login greeting common to all auth methods
  */
 void smtp_auth_greeting(void) {
-		cprintf("235 2.0.0 Hello, %s\r\n", CC->user.fullname);
-		lprintf(CTDL_NOTICE, "SMTP authenticated %s\n", CC->user.fullname);
+		cprintf("235 Hello, %s\r\n", CC->user.fullname);
+		CtdlLogPrintf(CTDL_NOTICE, "SMTP authenticated %s\n", CC->user.fullname);
 		CC->internal_pgm = 0;
 		CC->cs_flags &= ~CS_STEALTH;
 }
@@ -260,29 +276,21 @@ void smtp_hello(char *argbuf, int which_command) {
 		cprintf("250-SIZE %ld\r\n", config.c_maxmsglen);
 
 #ifdef HAVE_OPENSSL
-
-		/* Only offer the PIPELINING command if TLS is inactive,
-		 * because of flow control issues.  Also, avoid offering TLS
-		 * if TLS is already active.  Finally, we only offer TLS on
+		/*
+		 * Offer TLS, but only if TLS is not already active.
+		 * Furthermore, only offer TLS when running on
 		 * the SMTP-MSA port, not on the SMTP-MTA port, due to
 		 * questionable reliability of TLS in certain sending MTA's.
 		 */
 		if ( (!CC->redirect_ssl) && (SMTP->is_msa) ) {
-			cprintf("250-PIPELINING\r\n");
 			cprintf("250-STARTTLS\r\n");
 		}
-
-#else	/* HAVE_OPENSSL */
-
-		/* Non SSL enabled server, so always offer PIPELINING. */
-		cprintf("250-PIPELINING\r\n");
-
 #endif	/* HAVE_OPENSSL */
 
-		cprintf("250-AUTH LOGIN PLAIN\r\n");
-		cprintf("250-AUTH=LOGIN PLAIN\r\n");
-
-		cprintf("250 ENHANCEDSTATUSCODES\r\n");
+		cprintf("250-AUTH LOGIN PLAIN\r\n"
+			"250-AUTH=LOGIN PLAIN\r\n"
+			"250 8BITMIME\r\n"
+		);
 	}
 }
 
@@ -292,17 +300,7 @@ void smtp_hello(char *argbuf, int which_command) {
  * Implement HELP command.
  */
 void smtp_help(void) {
-	cprintf("214-Commands accepted:\r\n");
-	cprintf("214-    DATA\r\n");
-	cprintf("214-    EHLO\r\n");
-	cprintf("214-    HELO\r\n");
-	cprintf("214-    HELP\r\n");
-	cprintf("214-    MAIL\r\n");
-	cprintf("214-    NOOP\r\n");
-	cprintf("214-    QUIT\r\n");
-	cprintf("214-    RCPT\r\n");
-	cprintf("214-    RSET\r\n");
-	cprintf("214     \r\n");
+	cprintf("214 RTFM http://www.ietf.org/rfc/rfc2821.txt\r\n");
 }
 
 
@@ -314,14 +312,14 @@ void smtp_get_user(char *argbuf) {
 	char username[SIZ];
 
 	CtdlDecodeBase64(username, argbuf, SIZ);
-	/* lprintf(CTDL_DEBUG, "Trying <%s>\n", username); */
+	/* CtdlLogPrintf(CTDL_DEBUG, "Trying <%s>\n", username); */
 	if (CtdlLoginExistingUser(NULL, username) == login_ok) {
 		CtdlEncodeBase64(buf, "Password:", 9, 0);
 		cprintf("334 %s\r\n", buf);
 		SMTP->command_state = smtp_password;
 	}
 	else {
-		cprintf("500 5.7.0 No such user.\r\n");
+		cprintf("500 No such user.\r\n");
 		SMTP->command_state = smtp_command;
 	}
 }
@@ -333,13 +331,14 @@ void smtp_get_user(char *argbuf) {
 void smtp_get_pass(char *argbuf) {
 	char password[SIZ];
 
+	memset(password, 0, sizeof(password));	
 	CtdlDecodeBase64(password, argbuf, SIZ);
-	/* lprintf(CTDL_DEBUG, "Trying <%s>\n", password); */
+	/* CtdlLogPrintf(CTDL_DEBUG, "Trying <%s>\n", password); */
 	if (CtdlTryPassword(password) == pass_ok) {
 		smtp_auth_greeting();
 	}
 	else {
-		cprintf("535 5.7.0 Authentication failed.\r\n");
+		cprintf("535 Authentication failed.\r\n");
 	}
 	SMTP->command_state = smtp_command;
 }
@@ -375,7 +374,7 @@ void smtp_try_plain(char *encoded_authstring) {
 			return;
 		}
 	}
-	cprintf("504 5.7.4 Authentication failed.\r\n");
+	cprintf("504 Authentication failed.\r\n");
 }
 
 
@@ -388,7 +387,7 @@ void smtp_auth(char *argbuf) {
 	char encoded_authstring[1024];
 
 	if (CC->logged_in) {
-		cprintf("504 5.7.4 Already logged in.\r\n");
+		cprintf("504 Already logged in.\r\n");
 		return;
 	}
 
@@ -420,7 +419,7 @@ void smtp_auth(char *argbuf) {
 	}
 
 	if (strncasecmp(method, "login", 5) ) {
-		cprintf("504 5.7.4 Unknown authentication method.\r\n");
+		cprintf("504 Unknown authentication method.\r\n");
 		return;
 	}
 
@@ -467,7 +466,7 @@ void smtp_rset(int do_response) {
 	SMTP->is_unfiltered = is_unfiltered;
 
 	if (do_response) {
-		cprintf("250 2.0.0 Zap!\r\n");
+		cprintf("250 Zap!\r\n");
 	}
 }
 
@@ -483,10 +482,16 @@ void smtp_data_clear(void) {
 	SMTP->message_originated_locally = 0;
 }
 
+const char *smtp_get_Recipients(void)
+{
+	if (SMTP == NULL)
+		return NULL;
+	else return SMTP->from;
 
+}
 
 /*
- * Implements the "MAIL From:" command
+ * Implements the "MAIL FROM:" command
  */
 void smtp_mail(char *argbuf) {
 	char user[SIZ];
@@ -494,12 +499,12 @@ void smtp_mail(char *argbuf) {
 	char name[SIZ];
 
 	if (!IsEmptyStr(SMTP->from)) {
-		cprintf("503 5.1.0 Only one sender permitted\r\n");
+		cprintf("503 Only one sender permitted\r\n");
 		return;
 	}
 
 	if (strncasecmp(argbuf, "From:", 5)) {
-		cprintf("501 5.1.7 Syntax error\r\n");
+		cprintf("501 Syntax error\r\n");
 		return;
 	}
 
@@ -516,7 +521,7 @@ void smtp_mail(char *argbuf) {
 	 * other code to fail when it's expecting something there.
 	 */
 	if (IsEmptyStr(SMTP->from)) {
-		strcpy(SMTP->from, "someone@somewhere.org");
+		strcpy(SMTP->from, "someone@example.com");
 	}
 
 	/* If this SMTP connection is from a logged-in user, force the 'from'
@@ -524,7 +529,7 @@ void smtp_mail(char *argbuf) {
 	 */
 	if (CC->logged_in) {
 		safestrncpy(SMTP->from, CC->cs_inet_email, sizeof SMTP->from);
-		cprintf("250 2.1.0 Sender ok <%s>\r\n", SMTP->from);
+		cprintf("250 Sender ok <%s>\r\n", SMTP->from);
 		SMTP->message_originated_locally = 1;
 		return;
 	}
@@ -539,15 +544,13 @@ void smtp_mail(char *argbuf) {
 	else if (config.c_allow_spoofing == 0) {
 		process_rfc822_addr(SMTP->from, user, node, name);
 		if (CtdlHostAlias(node) != hostalias_nomatch) {
-			cprintf("550 5.7.1 "
-				"You must log in to send mail from %s\r\n",
-				node);
+			cprintf("550 You must log in to send mail from %s\r\n", node);
 			strcpy(SMTP->from, "");
 			return;
 		}
 	}
 
-	cprintf("250 2.0.0 Sender ok\r\n");
+	cprintf("250 Sender ok\r\n");
 }
 
 
@@ -561,18 +564,17 @@ void smtp_rcpt(char *argbuf) {
 	struct recptypes *valid = NULL;
 
 	if (IsEmptyStr(SMTP->from)) {
-		cprintf("503 5.5.1 Need MAIL before RCPT\r\n");
+		cprintf("503 Need MAIL before RCPT\r\n");
 		return;
 	}
 
 	if (strncasecmp(argbuf, "To:", 3)) {
-		cprintf("501 5.1.7 Syntax error\r\n");
+		cprintf("501 Syntax error\r\n");
 		return;
 	}
 
 	if ( (SMTP->is_msa) && (!CC->logged_in) ) {
-		cprintf("550 5.1.8 "
-			"You must log in to send mail on this port.\r\n");
+		cprintf("550 You must log in to send mail on this port.\r\n");
 		strcpy(SMTP->from, "");
 		return;
 	}
@@ -582,7 +584,7 @@ void smtp_rcpt(char *argbuf) {
 	stripallbut(recp, '<', '>');
 
 	if ( (strlen(recp) + strlen(SMTP->recipients) + 1 ) >= SIZ) {
-		cprintf("452 4.5.3 Too many recipients\r\n");
+		cprintf("452 Too many recipients\r\n");
 		return;
 	}
 
@@ -591,16 +593,23 @@ void smtp_rcpt(char *argbuf) {
 	   && (!SMTP->is_lmtp) ) {	/* Don't RBL LMTP clients */
 		if (config.c_rbl_at_greeting == 0) {	/* Don't RBL again if we already did it */
 			if (rbl_check(message_to_spammer)) {
-				cprintf("550 %s\r\n", message_to_spammer);
+				if (CtdlThreadCheckStop())
+					cprintf("421 %s\r\n", message_to_spammer);
+				else
+					cprintf("550 %s\r\n", message_to_spammer);
 				/* no need to free_recipients(valid), it's not allocated yet */
 				return;
 			}
 		}
 	}
 
-	valid = validate_recipients(recp);
+	valid = validate_recipients(recp, 
+				    smtp_get_Recipients (),
+				    (SMTP->is_lmtp)? POST_LMTP:
+				       (CC->logged_in)? POST_LOGGED_IN:
+				                        POST_EXTERNAL);
 	if (valid->num_error != 0) {
-		cprintf("599 5.1.1 Error: %s\r\n", valid->errormsg);
+		cprintf("550 %s\r\n", valid->errormsg);
 		free_recipients(valid);
 		return;
 	}
@@ -608,7 +617,7 @@ void smtp_rcpt(char *argbuf) {
 	if (valid->num_internet > 0) {
 		if (CC->logged_in) {
                         if (CtdlCheckInternetMailPermission(&CC->user)==0) {
-				cprintf("551 5.7.1 <%s> - you do not have permission to send Internet mail\r\n", recp);
+				cprintf("551 <%s> - you do not have permission to send Internet mail\r\n", recp);
                                 free_recipients(valid);
                                 return;
                         }
@@ -618,13 +627,13 @@ void smtp_rcpt(char *argbuf) {
 	if (valid->num_internet > 0) {
 		if ( (SMTP->message_originated_locally == 0)
 		   && (SMTP->is_lmtp == 0) ) {
-			cprintf("551 5.7.1 <%s> - relaying denied\r\n", recp);
+			cprintf("551 <%s> - relaying denied\r\n", recp);
 			free_recipients(valid);
 			return;
 		}
 	}
 
-	cprintf("250 2.1.5 RCPT ok <%s>\r\n", recp);
+	cprintf("250 RCPT ok <%s>\r\n", recp);
 	if (!IsEmptyStr(SMTP->recipients)) {
 		strcat(SMTP->recipients, ",");
 	}
@@ -652,12 +661,12 @@ void smtp_data(void) {
 	char result[SIZ];
 
 	if (IsEmptyStr(SMTP->from)) {
-		cprintf("503 5.5.1 Need MAIL command first.\r\n");
+		cprintf("503 Need MAIL command first.\r\n");
 		return;
 	}
 
 	if (SMTP->number_of_recipients < 1) {
-		cprintf("503 5.5.1 Need RCPT command first.\r\n");
+		cprintf("503 Need RCPT command first.\r\n");
 		return;
 	}
 
@@ -666,23 +675,34 @@ void smtp_data(void) {
 	datestring(nowstamp, sizeof nowstamp, time(NULL), DATESTRING_RFC822);
 	body = malloc(4096);
 
-	if (body != NULL) snprintf(body, 4096,
-		"Received: from %s (%s [%s])\n"
-		"	by %s; %s\n",
-			SMTP->helo_node,
-			CC->cs_host,
-			CC->cs_addr,
-			config.c_fqdn,
-			nowstamp);
-	
+	if (body != NULL) {
+		if (SMTP->is_lmtp && (CC->cs_UDSclientUID != -1)) {
+			snprintf(body, 4096,
+				 "Received: from %s (Citadel from userid %ld)\n"
+				 "	by %s; %s\n",
+				 SMTP->helo_node,
+				 CC->cs_UDSclientUID,
+				 config.c_fqdn,
+				 nowstamp);
+		}
+		else {
+			snprintf(body, 4096,
+				 "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, 1, 0);
 	if (body == NULL) {
-		cprintf("550 5.6.5 "
-			"Unable to save message: internal error.\r\n");
+		cprintf("550 Unable to save message: internal error.\r\n");
 		return;
 	}
 
-	lprintf(CTDL_DEBUG, "Converting message...\n");
+	CtdlLogPrintf(CTDL_DEBUG, "Converting message...\n");
 	msg = convert_internet_message(body);
 
 	/* If the user is locally authenticated, FORCE the From: header to
@@ -721,7 +741,11 @@ void smtp_data(void) {
 	msg->cm_fields['V'] = strdup(SMTP->recipients);
 
 	/* Submit the message into the Citadel system. */
-	valid = validate_recipients(SMTP->recipients);
+	valid = validate_recipients(SMTP->recipients, 
+				    smtp_get_Recipients (),
+				    (SMTP->is_lmtp)? POST_LMTP:
+				       (CC->logged_in)? POST_LOGGED_IN:
+				                        POST_EXTERNAL);
 
 	/* If there are modules that want to scan this message before final
 	 * submission (such as virus checkers or spam filters), call them now
@@ -737,20 +761,19 @@ void smtp_data(void) {
 	if (scan_errors > 0) {	/* We don't want this message! */
 
 		if (msg->cm_fields['0'] == NULL) {
-			msg->cm_fields['0'] = strdup(
-				"5.7.1 Message rejected by filter");
+			msg->cm_fields['0'] = strdup("Message rejected by filter");
 		}
 
 		sprintf(result, "550 %s\r\n", msg->cm_fields['0']);
 	}
 	
 	else {			/* Ok, we'll accept this message. */
-		msgnum = CtdlSubmitMsg(msg, valid, "");
+		msgnum = CtdlSubmitMsg(msg, valid, "", 0);
 		if (msgnum > 0L) {
-			sprintf(result, "250 2.0.0 Message accepted.\r\n");
+			sprintf(result, "250 Message accepted.\r\n");
 		}
 		else {
-			sprintf(result, "550 5.5.0 Internal delivery error\r\n");
+			sprintf(result, "550 Internal delivery error\r\n");
 		}
 	}
 
@@ -801,11 +824,11 @@ void smtp_starttls(void)
 	char error_response[SIZ];
 
 	sprintf(ok_response,
-		"220 2.0.0 Begin TLS negotiation now\r\n");
+		"220 Begin TLS negotiation now\r\n");
 	sprintf(nosup_response,
-		"554 5.7.3 TLS not supported here\r\n");
+		"554 TLS not supported here\r\n");
 	sprintf(error_response,
-		"554 5.7.3 Internal error\r\n");
+		"554 Internal error\r\n");
 	CtdlModuleStartCryptoMsgs(ok_response, nosup_response, error_response);
 	smtp_rset(0);
 }
@@ -821,11 +844,11 @@ void smtp_command_loop(void) {
 	time(&CC->lastcmd);
 	memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
 	if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
-		lprintf(CTDL_CRIT, "Client disconnected: ending session.\n");
+		CtdlLogPrintf(CTDL_CRIT, "Client disconnected: ending session.\n");
 		CC->kill_me = 1;
 		return;
 	}
-	lprintf(CTDL_INFO, "SMTP: %s\n", cmdbuf);
+	CtdlLogPrintf(CTDL_INFO, "SMTP server: %s\n", cmdbuf);
 	while (strlen(cmdbuf) < 5) strcat(cmdbuf, " ");
 
 	if (SMTP->command_state == smtp_user) {
@@ -891,7 +914,7 @@ void smtp_command_loop(void) {
 	}
 #endif
 	else {
-		cprintf("502 5.0.0 I'm afraid I can't do that.\r\n");
+		cprintf("502 I'm afraid I can't do that.\r\n");
 	}
 
 
@@ -913,7 +936,7 @@ void smtp_command_loop(void) {
  *
  */
 void smtp_try(const char *key, const char *addr, int *status,
-	      char *dsn, size_t n, long msgnum)
+	      char *dsn, size_t n, long msgnum, char *envelope_from)
 {
 	int sock = (-1);
 	char mxhosts[1024];
@@ -932,74 +955,78 @@ void smtp_try(const char *key, const char *addr, int *status,
 	char *ptr;
 	size_t msg_size;
 	int scan_done;
-
+	
+	
 	/* Parse out the host portion of the recipient address */
 	process_rfc822_addr(addr, user, node, name);
 
-	lprintf(CTDL_DEBUG, "Attempting SMTP delivery to <%s> @ <%s> (%s)\n",
+	CtdlLogPrintf(CTDL_DEBUG, "SMTP client: Attempting delivery to <%s> @ <%s> (%s)\n",
 		user, node, name);
 
 	/* Load the message out of the database */
 	CC->redirect_buffer = malloc(SIZ);
 	CC->redirect_len = 0;
 	CC->redirect_alloc = SIZ;
-	CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL);
+	CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL, ESC_DOT);
 	msgtext = CC->redirect_buffer;
 	msg_size = CC->redirect_len;
 	CC->redirect_buffer = NULL;
 	CC->redirect_len = 0;
 	CC->redirect_alloc = 0;
 
-	/* Extract something to send later in the 'MAIL From:' command */
-	strcpy(mailfrom, "");
-	scan_done = 0;
-	ptr = msgtext;
-	do {
-		if (ptr = memreadline(ptr, buf, sizeof buf), *ptr == 0) {
-			scan_done = 1;
-		}
-		if (!strncasecmp(buf, "From:", 5)) {
-			safestrncpy(mailfrom, &buf[5], sizeof mailfrom);
-			striplt(mailfrom);
-			for (i=0; mailfrom[i]; ++i) {
-				if (!isprint(mailfrom[i])) {
-					strcpy(&mailfrom[i], &mailfrom[i+1]);
-					i=0;
-				}
-			}
-
-			/* Strip out parenthesized names */
-			lp = (-1);
-			rp = (-1);
-			for (i=0; mailfrom[i]; ++i) {
-				if (mailfrom[i] == '(') lp = i;
-				if (mailfrom[i] == ')') rp = i;
-			}
-			if ((lp>0)&&(rp>lp)) {
-				strcpy(&mailfrom[lp-1], &mailfrom[rp+1]);
-			}
-
-			/* Prefer brokketized names */
-			lp = (-1);
-			rp = (-1);
-			for (i=0; mailfrom[i]; ++i) {
-				if (mailfrom[i] == '<') lp = i;
-				if (mailfrom[i] == '>') rp = i;
+	/* If no envelope_from is supplied, extract one from the message */
+	if ( (envelope_from == NULL) || (IsEmptyStr(envelope_from)) ) {
+		strcpy(mailfrom, "");
+		scan_done = 0;
+		ptr = msgtext;
+		do {
+			if (ptr = memreadline(ptr, buf, sizeof buf), *ptr == 0) {
+				scan_done = 1;
 			}
-			if ( (lp>=0) && (rp>lp) ) {
-				mailfrom[rp] = 0;
-				strcpy(mailfrom, &mailfrom[lp]);
+			if (!strncasecmp(buf, "From:", 5)) {
+				safestrncpy(mailfrom, &buf[5], sizeof mailfrom);
+				striplt(mailfrom);
+				for (i=0; mailfrom[i]; ++i) {
+					if (!isprint(mailfrom[i])) {
+						strcpy(&mailfrom[i], &mailfrom[i+1]);
+						i=0;
+					}
+				}
+	
+				/* Strip out parenthesized names */
+				lp = (-1);
+				rp = (-1);
+				for (i=0; mailfrom[i]; ++i) {
+					if (mailfrom[i] == '(') lp = i;
+					if (mailfrom[i] == ')') rp = i;
+				}
+				if ((lp>0)&&(rp>lp)) {
+					strcpy(&mailfrom[lp-1], &mailfrom[rp+1]);
+				}
+	
+				/* Prefer brokketized names */
+				lp = (-1);
+				rp = (-1);
+				for (i=0; mailfrom[i]; ++i) {
+					if (mailfrom[i] == '<') lp = i;
+					if (mailfrom[i] == '>') rp = i;
+				}
+				if ( (lp>=0) && (rp>lp) ) {
+					mailfrom[rp] = 0;
+					strcpy(mailfrom, &mailfrom[lp]);
+				}
+	
+				scan_done = 1;
 			}
-
-			scan_done = 1;
-		}
-	} while (scan_done == 0);
-	if (IsEmptyStr(mailfrom)) strcpy(mailfrom, "someone@somewhere.org");
-	stripallbut(mailfrom, '<', '>');
+		} while (scan_done == 0);
+		if (IsEmptyStr(mailfrom)) strcpy(mailfrom, "someone@somewhere.org");
+		stripallbut(mailfrom, '<', '>');
+		envelope_from = mailfrom;
+	}
 
 	/* Figure out what mail exchanger host we have to connect to */
 	num_mxhosts = getmx(mxhosts, node);
-	lprintf(CTDL_DEBUG, "Number of MX hosts for <%s> is %d\n", node, num_mxhosts);
+	CtdlLogPrintf(CTDL_DEBUG, "Number of MX hosts for <%s> is %d [%s]\n", node, num_mxhosts, mxhosts);
 	if (num_mxhosts < 1) {
 		*status = 5;
 		snprintf(dsn, SIZ, "No MX hosts found for <%s>", node);
@@ -1033,10 +1060,10 @@ void smtp_try(const char *key, const char *addr, int *status,
 		else {
 			strcpy(mx_port, "25");
 		}
-		lprintf(CTDL_DEBUG, "Trying %s : %s ...\n", mx_host, mx_port);
+		CtdlLogPrintf(CTDL_DEBUG, "SMTP client: connecting to %s : %s ...\n", mx_host, mx_port);
 		sock = sock_connect(mx_host, mx_port, "tcp");
 		snprintf(dsn, SIZ, "Could not connect: %s", strerror(errno));
-		if (sock >= 0) lprintf(CTDL_DEBUG, "Connected!\n");
+		if (sock >= 0) CtdlLogPrintf(CTDL_DEBUG, "SMTP client: connected!\n");
 		if (sock < 0) {
 			if (errno > 0) {
 				snprintf(dsn, SIZ, "%s", strerror(errno));
@@ -1058,7 +1085,7 @@ void smtp_try(const char *key, const char *addr, int *status,
 		strcpy(dsn, "Connection broken during SMTP conversation");
 		goto bail;
 	}
-	lprintf(CTDL_DEBUG, "<%s\n", buf);
+	CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
 	if (buf[0] != '2') {
 		if (buf[0] == '4') {
 			*status = 4;
@@ -1076,17 +1103,17 @@ void smtp_try(const char *key, const char *addr, int *status,
 
 	/* Do a EHLO command.  If it fails, try the HELO command. */
 	snprintf(buf, sizeof buf, "EHLO %s\r\n", config.c_fqdn);
-	lprintf(CTDL_DEBUG, ">%s", buf);
+	CtdlLogPrintf(CTDL_DEBUG, ">%s", buf);
 	sock_write(sock, buf, strlen(buf));
 	if (ml_sock_gets(sock, buf) < 0) {
 		*status = 4;
 		strcpy(dsn, "Connection broken during SMTP HELO");
 		goto bail;
 	}
-	lprintf(CTDL_DEBUG, "<%s\n", buf);
+	CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
 	if (buf[0] != '2') {
 		snprintf(buf, sizeof buf, "HELO %s\r\n", config.c_fqdn);
-		lprintf(CTDL_DEBUG, ">%s", buf);
+		CtdlLogPrintf(CTDL_DEBUG, ">%s", buf);
 		sock_write(sock, buf, strlen(buf));
 		if (ml_sock_gets(sock, buf) < 0) {
 			*status = 4;
@@ -1113,14 +1140,14 @@ void smtp_try(const char *key, const char *addr, int *status,
 		sprintf(buf, "%s%c%s%c%s", mx_user, '\0', mx_user, '\0', mx_pass);
 		CtdlEncodeBase64(encoded, buf, strlen(mx_user) + strlen(mx_user) + strlen(mx_pass) + 2, 0);
 		snprintf(buf, sizeof buf, "AUTH PLAIN %s\r\n", encoded);
-		lprintf(CTDL_DEBUG, ">%s", buf);
+		CtdlLogPrintf(CTDL_DEBUG, ">%s", buf);
 		sock_write(sock, buf, strlen(buf));
 		if (ml_sock_gets(sock, buf) < 0) {
 			*status = 4;
 			strcpy(dsn, "Connection broken during SMTP AUTH");
 			goto bail;
 		}
-		lprintf(CTDL_DEBUG, "<%s\n", buf);
+		CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
 		if (buf[0] != '2') {
 			if (buf[0] == '4') {
 				*status = 4;
@@ -1135,16 +1162,16 @@ void smtp_try(const char *key, const char *addr, int *status,
 		}
 	}
 
-	/* previous command succeeded, now try the MAIL From: command */
-	snprintf(buf, sizeof buf, "MAIL From: <%s>\r\n", mailfrom);
-	lprintf(CTDL_DEBUG, ">%s", buf);
+	/* previous command succeeded, now try the MAIL FROM: command */
+	snprintf(buf, sizeof buf, "MAIL FROM:<%s>\r\n", envelope_from);
+	CtdlLogPrintf(CTDL_DEBUG, ">%s", buf);
 	sock_write(sock, buf, strlen(buf));
 	if (ml_sock_gets(sock, buf) < 0) {
 		*status = 4;
 		strcpy(dsn, "Connection broken during SMTP MAIL");
 		goto bail;
 	}
-	lprintf(CTDL_DEBUG, "<%s\n", buf);
+	CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
 	if (buf[0] != '2') {
 		if (buf[0] == '4') {
 			*status = 4;
@@ -1159,15 +1186,15 @@ void smtp_try(const char *key, const char *addr, int *status,
 	}
 
 	/* MAIL succeeded, now try the RCPT To: command */
-	snprintf(buf, sizeof buf, "RCPT To: <%s@%s>\r\n", user, node);
-	lprintf(CTDL_DEBUG, ">%s", buf);
+	snprintf(buf, sizeof buf, "RCPT TO:<%s@%s>\r\n", user, node);
+	CtdlLogPrintf(CTDL_DEBUG, ">%s", buf);
 	sock_write(sock, buf, strlen(buf));
 	if (ml_sock_gets(sock, buf) < 0) {
 		*status = 4;
 		strcpy(dsn, "Connection broken during SMTP RCPT");
 		goto bail;
 	}
-	lprintf(CTDL_DEBUG, "<%s\n", buf);
+	CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
 	if (buf[0] != '2') {
 		if (buf[0] == '4') {
 			*status = 4;
@@ -1182,14 +1209,14 @@ void smtp_try(const char *key, const char *addr, int *status,
 	}
 
 	/* RCPT succeeded, now try the DATA command */
-	lprintf(CTDL_DEBUG, ">DATA\n");
+	CtdlLogPrintf(CTDL_DEBUG, ">DATA\n");
 	sock_write(sock, "DATA\r\n", 6);
 	if (ml_sock_gets(sock, buf) < 0) {
 		*status = 4;
 		strcpy(dsn, "Connection broken during SMTP DATA");
 		goto bail;
 	}
-	lprintf(CTDL_DEBUG, "<%s\n", buf);
+	CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
 	if (buf[0] != '3') {
 		if (buf[0] == '4') {
 			*status = 3;
@@ -1203,10 +1230,10 @@ void smtp_try(const char *key, const char *addr, int *status,
 		}
 	}
 
-	/* If we reach this point, the server is expecting data */
+	/* If we reach this point, the server is expecting data.*/
 	sock_write(sock, msgtext, msg_size);
 	if (msgtext[msg_size-1] != 10) {
-		lprintf(CTDL_WARNING, "Possible problem: message did not "
+		CtdlLogPrintf(CTDL_WARNING, "Possible problem: message did not "
 			"correctly terminate. (expecting 0x10, got 0x%02x)\n",
 				buf[msg_size-1]);
 	}
@@ -1217,7 +1244,7 @@ void smtp_try(const char *key, const char *addr, int *status,
 		strcpy(dsn, "Connection broken during SMTP message transmit");
 		goto bail;
 	}
-	lprintf(CTDL_DEBUG, "%s\n", buf);
+	CtdlLogPrintf(CTDL_DEBUG, "%s\n", buf);
 	if (buf[0] != '2') {
 		if (buf[0] == '4') {
 			*status = 4;
@@ -1235,11 +1262,11 @@ void smtp_try(const char *key, const char *addr, int *status,
 	safestrncpy(dsn, &buf[4], 1023);
 	*status = 2;
 
-	lprintf(CTDL_DEBUG, ">QUIT\n");
+	CtdlLogPrintf(CTDL_DEBUG, ">QUIT\n");
 	sock_write(sock, "QUIT\r\n", 6);
 	ml_sock_gets(sock, buf);
-	lprintf(CTDL_DEBUG, "<%s\n", buf);
-	lprintf(CTDL_INFO, "SMTP delivery to <%s> @ <%s> (%s) succeeded\n",
+	CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
+	CtdlLogPrintf(CTDL_INFO, "SMTP client: delivery to <%s> @ <%s> (%s) succeeded\n",
 		user, node, name);
 
 bail:	free(msgtext);
@@ -1291,7 +1318,7 @@ void smtp_do_bounce(char *instr) {
 	size_t omsgsize;
 	long omsgid = (-1);
 
-	lprintf(CTDL_DEBUG, "smtp_do_bounce() called\n");
+	CtdlLogPrintf(CTDL_DEBUG, "smtp_do_bounce() called\n");
 	strcpy(bounceto, "");
 	sprintf(boundary, "=_Citadel_Multipart_%s_%04x%04x", config.c_fqdn, getpid(), ++seq);
 	lines = num_tokens(instr, '\n');
@@ -1358,7 +1385,7 @@ void smtp_do_bounce(char *instr) {
 		extract_token(dsn, buf, 3, '|', sizeof dsn);
 		bounce_this = 0;
 
-		lprintf(CTDL_DEBUG, "key=<%s> addr=<%s> status=%d dsn=<%s>\n",
+		CtdlLogPrintf(CTDL_DEBUG, "key=<%s> addr=<%s> status=%d dsn=<%s>\n",
 			key, addr, status, dsn);
 
 		if (!strcasecmp(key, "bounceto")) {
@@ -1378,7 +1405,7 @@ void smtp_do_bounce(char *instr) {
 			++num_bounces;
 
 			if (bmsg->cm_fields['M'] == NULL) {
-				lprintf(CTDL_ERR, "ERROR ... M field is null "
+				CtdlLogPrintf(CTDL_ERR, "ERROR ... M field is null "
 					"(%s:%d)\n", __FILE__, __LINE__);
 			}
 
@@ -1408,7 +1435,7 @@ void smtp_do_bounce(char *instr) {
 		CC->redirect_buffer = malloc(SIZ);
 		CC->redirect_len = 0;
 		CC->redirect_alloc = SIZ;
-		CtdlOutputMsg(omsgid, MT_RFC822, HEADERS_ALL, 0, 1, NULL);
+		CtdlOutputMsg(omsgid, MT_RFC822, HEADERS_ALL, 0, 1, NULL, 0);
 		omsgtext = CC->redirect_buffer;
 		omsgsize = CC->redirect_len;
 		CC->redirect_buffer = NULL;
@@ -1426,28 +1453,28 @@ void smtp_do_bounce(char *instr) {
         strcat(bmsg->cm_fields['M'], "--\r\n");
 
 	/* Deliver the bounce if there's anything worth mentioning */
-	lprintf(CTDL_DEBUG, "num_bounces = %d\n", num_bounces);
+	CtdlLogPrintf(CTDL_DEBUG, "num_bounces = %d\n", num_bounces);
 	if (num_bounces > 0) {
 
 		/* First try the user who sent the message */
-		lprintf(CTDL_DEBUG, "bounce to user? <%s>\n", bounceto);
+		CtdlLogPrintf(CTDL_DEBUG, "bounce to user? <%s>\n", bounceto);
 		if (IsEmptyStr(bounceto)) {
-			lprintf(CTDL_ERR, "No bounce address specified\n");
+			CtdlLogPrintf(CTDL_ERR, "No bounce address specified\n");
 			bounce_msgid = (-1L);
 		}
 
 		/* Can we deliver the bounce to the original sender? */
-		valid = validate_recipients(bounceto);
+		valid = validate_recipients(bounceto, smtp_get_Recipients (), 0);
 		if (valid != NULL) {
 			if (valid->num_error == 0) {
-				CtdlSubmitMsg(bmsg, valid, "");
+				CtdlSubmitMsg(bmsg, valid, "", QP_EADDR);
 				successful_bounce = 1;
 			}
 		}
 
 		/* If not, post it in the Aide> room */
 		if (successful_bounce == 0) {
-			CtdlSubmitMsg(bmsg, NULL, config.c_aideroom);
+			CtdlSubmitMsg(bmsg, NULL, config.c_aideroom, QP_EADDR);
 		}
 
 		/* Free up the memory we used */
@@ -1457,7 +1484,7 @@ void smtp_do_bounce(char *instr) {
 	}
 
 	CtdlFreeMessage(bmsg);
-	lprintf(CTDL_DEBUG, "Done processing bounces\n");
+	CtdlLogPrintf(CTDL_DEBUG, "Done processing bounces\n");
 }
 
 
@@ -1520,17 +1547,19 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 	char key[1024];
 	char addr[1024];
 	char dsn[1024];
+	char envelope_from[1024];
 	long text_msgid = (-1);
 	int incomplete_deliveries_remaining;
 	time_t attempted = 0L;
 	time_t last_attempted = 0L;
 	time_t retry = SMTP_RETRY_INTERVAL;
 
-	lprintf(CTDL_DEBUG, "smtp_do_procmsg(%ld)\n", msgnum);
+	CtdlLogPrintf(CTDL_DEBUG, "SMTP client: smtp_do_procmsg(%ld)\n", msgnum);
+	strcpy(envelope_from, "");
 
 	msg = CtdlFetchMessage(msgnum, 1);
 	if (msg == NULL) {
-		lprintf(CTDL_ERR, "SMTP: tried %ld but no such message!\n", msgnum);
+		CtdlLogPrintf(CTDL_ERR, "SMTP client: tried %ld but no such message!\n", msgnum);
 		return;
 	}
 
@@ -1556,6 +1585,9 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 		if (!strcasecmp(key, "msgid")) {
 			text_msgid = extract_long(buf, 1);
 		}
+		if (!strcasecmp(key, "envelope_from")) {
+			extract_token(envelope_from, buf, 1, '|', sizeof envelope_from);
+		}
 		if (!strcasecmp(key, "retry")) {
 			/* double the retry interval after each attempt */
 			retry = extract_long(buf, 1) * 2L;
@@ -1575,7 +1607,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 	 * Postpone delivery if we've already tried recently.
 	 */
 	if (((time(NULL) - last_attempted) < retry) && (run_queue_now == 0)) {
-		lprintf(CTDL_DEBUG, "Retry time not yet reached.\n");
+		CtdlLogPrintf(CTDL_DEBUG, "SMTP client: Retry time not yet reached.\n");
 		free(instr);
 		return;
 	}
@@ -1585,7 +1617,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 	 * Bail out if there's no actual message associated with this
 	 */
 	if (text_msgid < 0L) {
-		lprintf(CTDL_ERR, "SMTP: no 'msgid' directive found!\n");
+		CtdlLogPrintf(CTDL_ERR, "SMTP client: no 'msgid' directive found!\n");
 		free(instr);
 		return;
 	}
@@ -1615,16 +1647,15 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 
 			--i;
 			--lines;
-			lprintf(CTDL_DEBUG, "SMTP: Trying <%s>\n", addr);
-			smtp_try(key, addr, &status, dsn, sizeof dsn, text_msgid);
+			CtdlLogPrintf(CTDL_DEBUG, "SMTP client: Trying <%s>\n", addr);
+			smtp_try(key, addr, &status, dsn, sizeof dsn, text_msgid, envelope_from);
 			if (status != 2) {
 				if (results == NULL) {
 					results = malloc(1024);
 					memset(results, 0, 1024);
 				}
 				else {
-					results = realloc(results,
-						strlen(results) + 1024);
+					results = realloc(results, strlen(results) + 1024);
 				}
 				snprintf(&results[strlen(results)], 1024,
 					"%s|%s|%d|%s\n",
@@ -1677,7 +1708,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 			"attempted|%ld\n"
 			"retry|%ld\n",
 			SPOOLMIME, instr, (long)time(NULL), (long)retry );
-		CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM);
+		CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
 		CtdlFreeMessage(msg);
 	}
 
@@ -1693,6 +1724,7 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
  */
 void smtp_do_queue(void) {
 	static int doing_queue = 0;
+	int num_processed = 0;
 
 	/*
 	 * This is a simple concurrency check to make sure only one queue run
@@ -1706,16 +1738,15 @@ void smtp_do_queue(void) {
 	/* 
 	 * Go ahead and run the queue
 	 */
-	lprintf(CTDL_INFO, "SMTP: processing outbound queue\n");
+	CtdlLogPrintf(CTDL_INFO, "SMTP client: processing outbound queue\n");
 
 	if (getroom(&CC->room, SMTP_SPOOLOUT_ROOM) != 0) {
-		lprintf(CTDL_ERR, "Cannot find room <%s>\n", SMTP_SPOOLOUT_ROOM);
+		CtdlLogPrintf(CTDL_ERR, "Cannot find room <%s>\n", SMTP_SPOOLOUT_ROOM);
 		return;
 	}
-	CtdlForEachMessage(MSGS_ALL, 0L, NULL,
-		SPOOLMIME, NULL, smtp_do_procmsg, NULL);
+	num_processed = CtdlForEachMessage(MSGS_ALL, 0L, NULL, SPOOLMIME, NULL, smtp_do_procmsg, NULL);
 
-	lprintf(CTDL_INFO, "SMTP: queue run completed\n");
+	CtdlLogPrintf(CTDL_INFO, "SMTP client: queue run completed; %d messages processed\n", num_processed);
 	run_queue_now = 0;
 	doing_queue = 0;
 }
@@ -1800,7 +1831,7 @@ void smtp_cleanup_function(void) {
 	/* Don't do this stuff if this is not an SMTP session! */
 	if (CC->h_command_function != smtp_command_loop) return;
 
-	lprintf(CTDL_DEBUG, "Performing SMTP cleanup hook\n");
+	CtdlLogPrintf(CTDL_DEBUG, "Performing SMTP cleanup hook\n");
 	free(SMTP);
 }
 
@@ -1814,48 +1845,51 @@ const char *CitadelServiceSMTP_LMTP_UNF="LMTP-UnF";
 
 CTDL_MODULE_INIT(smtp)
 {
-	CtdlRegisterServiceHook(config.c_smtp_port,	/* SMTP MTA */
-				NULL,
-				smtp_mta_greeting,
-				smtp_command_loop,
-				NULL, 
-				CitadelServiceSMTP_MTA);
+	if (!threading)
+	{
+		CtdlRegisterServiceHook(config.c_smtp_port,	/* SMTP MTA */
+					NULL,
+					smtp_mta_greeting,
+					smtp_command_loop,
+					NULL, 
+					CitadelServiceSMTP_MTA);
 
 #ifdef HAVE_OPENSSL
-	CtdlRegisterServiceHook(config.c_smtps_port,
-				NULL,
-				smtps_greeting,
-				smtp_command_loop,
-				NULL,
-				CitadelServiceSMTPS_MTA);
+		CtdlRegisterServiceHook(config.c_smtps_port,
+					NULL,
+					smtps_greeting,
+					smtp_command_loop,
+					NULL,
+					CitadelServiceSMTPS_MTA);
 #endif
 
-	CtdlRegisterServiceHook(config.c_msa_port,	/* SMTP MSA */
-				NULL,
-				smtp_msa_greeting,
-				smtp_command_loop,
-				NULL,
-				CitadelServiceSMTP_MSA);
-
-	CtdlRegisterServiceHook(0,			/* local LMTP */
-				file_lmtp_socket,
-				lmtp_greeting,
-				smtp_command_loop,
-				NULL,
-				CitadelServiceSMTP_LMTP);
-
-	CtdlRegisterServiceHook(0,			/* local LMTP */
-				file_lmtp_unfiltered_socket,
-				lmtp_unfiltered_greeting,
-				smtp_command_loop,
-				NULL,
-				CitadelServiceSMTP_LMTP_UNF);
-
-	smtp_init_spoolout();
-	CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER);
-	CtdlRegisterSessionHook(smtp_cleanup_function, EVT_STOP);
-	CtdlRegisterProtoHook(cmd_smtp, "SMTP", "SMTP utility commands");
-
+		CtdlRegisterServiceHook(config.c_msa_port,	/* SMTP MSA */
+					NULL,
+					smtp_msa_greeting,
+					smtp_command_loop,
+					NULL,
+					CitadelServiceSMTP_MSA);
+
+		CtdlRegisterServiceHook(0,			/* local LMTP */
+					file_lmtp_socket,
+					lmtp_greeting,
+					smtp_command_loop,
+					NULL,
+					CitadelServiceSMTP_LMTP);
+
+		CtdlRegisterServiceHook(0,			/* local LMTP */
+					file_lmtp_unfiltered_socket,
+					lmtp_unfiltered_greeting,
+					smtp_command_loop,
+					NULL,
+					CitadelServiceSMTP_LMTP_UNF);
+
+		smtp_init_spoolout();
+		CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER);
+		CtdlRegisterSessionHook(smtp_cleanup_function, EVT_STOP);
+		CtdlRegisterProtoHook(cmd_smtp, "SMTP", "SMTP utility commands");
+	}
+	
 	/* return our Subversion id for the Log */
 	return "$Id$";
 }