From 1d38a44a1c08942be7f411be6989082f88aafa22 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Mon, 4 Jun 2001 08:07:53 +0000 Subject: Don't generate MAIL FROM headers with embedded newlines. svn path=/trunk/; revision=3334 --- driver.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/driver.c b/driver.c index 505bf26c..d05c8ef3 100644 --- a/driver.c +++ b/driver.c @@ -922,7 +922,9 @@ static int readheaders(int sock, else if (from_offs >= 0 && (ap = nxtaddr(msgblk.headers + from_offs))); else if (reply_to_offs >= 0 && (ap = nxtaddr(msgblk.headers + reply_to_offs))); else if (app_from_offs >= 0 && (ap = nxtaddr(msgblk.headers + app_from_offs))); - if (ap) strcpy( msgblk.return_path, ap ); + /* multi-line MAIL FROM addresses confuse SMTP terribly */ + if (ap && !strchr(ap, '\n')) + strcpy(msgblk.return_path, ap); } /* cons up a list of local recipients */ -- cgit v1.2.3