[PATCH] sendmail: use FQDN in default envelope sender

[Denys Vlasenko]

Applied, thanks!

On Sat, Feb 8, 2014 at 11:07 PM, Kaarle Ritvanen
<kaarle.ritvanen at datakunkku.fi> wrote:
> RFC 5321 requires the return path to be supplied with a proper domain
> name.
>
> Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen at datakunkku.fi>
> ---
>  mailutils/sendmail.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
> index 824109d..9455b4e 100644
> --- a/mailutils/sendmail.c
> +++ b/mailutils/sendmail.c
> @@ -326,7 +326,6 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
>         // we should start with modern EHLO
>         if (250 != smtp_checkp("EHLO %s", host, -1))
>                 smtp_checkp("HELO %s", host, 250);
> -       free(host);
>
>         // perform authentication
>         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
>         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);
>
> --
> 1.8.3.1
>
> _______________________________________________
> busybox mailing list
> busybox at busybox.net
> http://lists.busybox.net/mailman/listinfo/busybox