aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2001-06-04 08:07:53 +0000
committerEric S. Raymond <esr@thyrsus.com>2001-06-04 08:07:53 +0000
commit1d38a44a1c08942be7f411be6989082f88aafa22 (patch)
treed703a718b8d8dc88898d88ba658246086e74f5eb
parentb3fe76c9666b4c7d5d142c73ebab774c4f9a2677 (diff)
downloadfetchmail-1d38a44a1c08942be7f411be6989082f88aafa22.tar.gz
fetchmail-1d38a44a1c08942be7f411be6989082f88aafa22.tar.bz2
fetchmail-1d38a44a1c08942be7f411be6989082f88aafa22.zip
Don't generate MAIL FROM headers with embedded newlines.
svn path=/trunk/; revision=3334
-rw-r--r--driver.c4
1 files changed, 3 insertions, 1 deletions
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 */