send-email: fix tls AUTH when sending batch
The variable smtp_encryption must keep it's value between two batches. Otherwise the authentication is skipped after the first batch. Signed-off-by: Jules Maselbas <jules.maselbas@grenoble-inp.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
53f9a3e157
commit
636f3d7ac5
@ -1479,7 +1479,7 @@ EOF
|
|||||||
SSL => 1);
|
SSL => 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
elsif (!$smtp) {
|
||||||
$smtp_server_port ||= 25;
|
$smtp_server_port ||= 25;
|
||||||
$smtp ||= Net::SMTP->new($smtp_server,
|
$smtp ||= Net::SMTP->new($smtp_server,
|
||||||
Hello => $smtp_domain,
|
Hello => $smtp_domain,
|
||||||
@ -1501,7 +1501,6 @@ EOF
|
|||||||
$smtp->starttls(ssl_verify_params())
|
$smtp->starttls(ssl_verify_params())
|
||||||
or die sprintf(__("STARTTLS failed! %s"), IO::Socket::SSL::errstr());
|
or die sprintf(__("STARTTLS failed! %s"), IO::Socket::SSL::errstr());
|
||||||
}
|
}
|
||||||
$smtp_encryption = '';
|
|
||||||
# Send EHLO again to receive fresh
|
# Send EHLO again to receive fresh
|
||||||
# supported commands
|
# supported commands
|
||||||
$smtp->hello($smtp_domain);
|
$smtp->hello($smtp_domain);
|
||||||
|
|||||||
Reference in New Issue
Block a user