emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sendmail: don't add To: header if it already exists

Browse Source 
If the message we are sending already has To: header, don't add a new one.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Aaro Koskinen 2013-02-25 00:45:11 +02:00 committed by Denys Vlasenko
parent 236f222cde
commit 4a732220e9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mailutils/sendmail.c
View File

@ -187,6 +187,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
HDR_BCC, HDR_BCC,
} last_hdr = 0; } last_hdr = 0;
int check_hdr; int check_hdr;
int has_to = 0;
enum { enum {
//--- standard options //--- standard options
@ -348,8 +349,10 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
// analyze headers // analyze headers
// To: or Cc: headers add recipients // To: or Cc: headers add recipients
check_hdr = 0 == strncasecmp("To:", s, 3);
has_to |= check_hdr;
if (opts & OPT_t) { if (opts & OPT_t) {
if (0 == strncasecmp("To:", s, 3) || 0 == strncasecmp("Bcc:" + 1, s, 3)) { if (check_hdr || 0 == strncasecmp("Bcc:" + 1, s, 3)) {
rcptto_list(s+3); rcptto_list(s+3);
last_hdr = HDR_TOCC; last_hdr = HDR_TOCC;
goto addheader; goto addheader;
@ -391,7 +394,9 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
rcptto(t); rcptto(t);
//if (MAX_HEADERS && ++nheaders >= MAX_HEADERS) //if (MAX_HEADERS && ++nheaders >= MAX_HEADERS)
// goto bail; // goto bail;
llist_add_to_end(&list, xasprintf("To: %s", t)); if (!has_to)
llist_add_to_end(&list,
xasprintf("To: %s", t));
argv++; argv++;
} }
// enter "put message" mode // enter "put message" mode