From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 Oct 2011 03:36:48 GMT
Subject: Re: [PATCH] send-email: Honour SMTP domain when using TLS
Message-ID: <7v62jpvc8f.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1318668292-13818-1-git-send-email-mattjd@gmail.com>

Matthew Daley <mattjd@gmail.com> writes:

> git-send-email sends two SMTP EHLOs when using TLS encryption, however
> only the first, unencrypted EHLO uses the SMTP domain that can be
> optionally specified by the user (--smtp-domain).  This is because the
> call to hello() that produces the second, encrypted EHLO does not pass
> the SMTP domain as an argument, and hence a default of
> 'localhost.localdomain' is used instead.
>
> Fix by passing in the SMTP domain in this call.
>
> Signed-off-by: Matthew Daley <mattjd@gmail.com>

Sounds sensible, thanks.

Brian, who did 69cf7bf (send-email: Cleanup smtp-domain and add config,
2010-04-10) to make the initial hello use $smtp_domain, could you take a
quick look and an Ack?

>  git-send-email.perl |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/git-send-email.perl b/git-send-email.perl
> index 6885dfa..d491db9 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -1098,7 +1098,7 @@ X-Mailer: git-send-email $gitversion
>  					$smtp_encryption = '';
>  					# Send EHLO again to receive fresh
>  					# supported commands
> -					$smtp->hello();
> +					$smtp->hello($smtp_domain);
>  				} else {
>  					die "Server does not support STARTTLS! ".$smtp->message;
>  				}