diff options
| author |  Matthew Daley <mattjd@gmail.com> | 2011-10-15 04:44:52 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-10-15 20:33:04 -0700 |
| commit | 155b940f7a117e9bba1b62e442c9e6e5853a3c0d (patch) | |
| tree | 1352b2a08c396a5e40554078a70340d810d5a63c | |
| parent | send-email: Cleanup smtp-domain and add config (diff) | |
| download | tgif-155b940f7a117e9bba1b62e442c9e6e5853a3c0d.tar.xz | |
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>
| -rwxr-xr-x | 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 0f23ed380f..6a17ed6d61 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; } |