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

sendmail: support addresses inside angle brackets

Browse Source 
When we extract addresses from the e-mail, try to first check for an
address inside angle brackets.

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:08 +02:00 committed by Denys Vlasenko
parent 95e99e5271
commit 06ad964ae6
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mailutils/sendmail.c
View File

@ -117,6 +117,24 @@ static char *sane_address(char *str)
return str; return str;
} }
// check for an address inside angle brackets, if not found fall back to normal
static char *angle_address(char *str)
{
char *s = str;
char *e = str + strlen(str);
while (e != str && (isspace(*e) || *e == '\0'))
e--;
if (*e != '>')
goto done;
*e = '\0';
e = strrchr(s, '<');
if (e != NULL)
s = e + 1;
done:
return sane_address(s);
}
static void rcptto(const char *s) static void rcptto(const char *s)
{ {
if (!*s) if (!*s)
@ -300,13 +318,13 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
if (opts & OPT_t) { if (opts & OPT_t) {
if (0 == strncasecmp("To:", s, 3) || 0 == strncasecmp("Bcc:" + 1, s, 3)) { if (0 == strncasecmp("To:", s, 3) || 0 == strncasecmp("Bcc:" + 1, s, 3)) {
char *r = xstrdup(s+3); char *r = xstrdup(s+3);
rcptto(sane_address(r)); rcptto(angle_address(r));
free(r); free(r);
goto addheader; goto addheader;
} }
// Bcc: header adds blind copy (hidden) recipient // Bcc: header adds blind copy (hidden) recipient
if (0 == strncasecmp("Bcc:", s, 4)) { if (0 == strncasecmp("Bcc:", s, 4)) {
rcptto(sane_address(s+4)); rcptto(angle_address(s+4));
free(s); free(s);
continue; // N.B. Bcc: vanishes from headers! continue; // N.B. Bcc: vanishes from headers!
} }