Skip to content

Commit

Permalink
send-email: Honour SMTP domain when using TLS
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matthew Daley authored and Junio C Hamano committed Oct 16, 2011
1 parent 69cf7bf commit 155b940
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-send-email.perl
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@ sub send_message {
$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;
}
Expand Down

0 comments on commit 155b940

Please sign in to comment.