From: Matthew Daley <mattjd@gmail.com>
Date: Sat, 15 Oct 2011 08:44:52 +0000 (-0400)
Subject: send-email: Honour SMTP domain when using TLS
X-Git-Tag: v1.7.8-rc0~47^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=155b940f7a117e9bba1b62e442c9e6e5853a3c0d;p=git.git

send-email: Honour SMTP domain when using TLS

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-send-email.perl b/git-send-email.perl
index 0f23ed380..6a17ed6d6 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1015,7 +1015,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;
 				}