summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Dronnikov <dronnikov@gmail.com>2009-10-17 01:35:10 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2009-10-17 01:35:10 (GMT)
commit8dbe9bba8ef8f12b0ce90042a5b6a1e20fe781bf (patch)
treed2ad1921ed22f43fd6a00359aba53a5200cbd81f
parent2ace0ad2d7ee52e44dc98feb77bedf5e866e8f11 (diff)
downloadbusybox-8dbe9bba8ef8f12b0ce90042a5b6a1e20fe781bf.tar.gz
busybox-8dbe9bba8ef8f12b0ce90042a5b6a1e20fe781bf.tar.bz2
sendmail: fix for long headers (by Vladimir)
Signed-off-by: Vladimir Dronnikov <dronnikov@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--mailutils/sendmail.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
index a216d66..2f99df6 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -229,10 +229,15 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
rcptto(sane_address(s+5));
free(s);
// N.B. Bcc: vanishes from headers!
+
// other headers go verbatim
- // N.B. we allow MAX_HEADERS generic headers at most to prevent attacks
- } else if (strchr(s, ':')) {
+
+ // N.B. RFC2822 2.2.3 "Long Header Fields" allows for headers to occupy several lines.
+ // Continuation is denoted by prefixing additional lines with whitespace(s).
+ // Thanks (stefan.seyfried at googlemail.com) for pointing this out.
+ } else if (strchr(s, ':') || (list && skip_whitespace(s) != s)) {
addheader:
+ // N.B. we allow MAX_HEADERS generic headers at most to prevent attacks
if (MAX_HEADERS && ++nheaders >= MAX_HEADERS)
goto bail;
llist_add_to_end(&list, s);