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

sendmail: use FQDN in default envelope sender

Browse Source 
RFC 5321 requires the return path to be supplied with a proper domain
name.

Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Kaarle Ritvanen 2014-02-09 09:49:36 +01:00 committed by Denys Vlasenko
parent 744ee5db1c
commit 4e03d41342
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mailutils/sendmail.c
View File

@ -326,7 +326,6 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
// we should start with modern EHLO // we should start with modern EHLO
if (250 != smtp_checkp("EHLO %s", host, -1)) if (250 != smtp_checkp("EHLO %s", host, -1))
smtp_checkp("HELO %s", host, 250); smtp_checkp("HELO %s", host, 250);
free(host);
// perform authentication // perform authentication
if (opts & OPT_a) { if (opts & OPT_a) {
@ -353,8 +352,11 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
// got no sender address? use auth name, then UID username as a last resort // got no sender address? use auth name, then UID username as a last resort
if (!opt_from) { if (!opt_from) {
opt_from = G.user ? G.user : xuid2uname(getuid()); opt_from = xasprintf("%s@%s",
G.user ? G.user : xuid2uname(getuid()),
xgethostbyname(host)->h_name);
} }
free(host);
smtp_checkp("MAIL FROM:<%s>", opt_from, 250); smtp_checkp("MAIL FROM:<%s>", opt_from, 250);