send-email: fix tls AUTH when sending batch
authorJules Maselbas <jules.maselbas@grenoble-inp.org>
Sat, 14 Jul 2018 08:58:48 +0000 (10:58 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jul 2018 22:02:36 +0000 (15:02 -0700)
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>
git-send-email.perl
index 8ec70e58ed5c4caace7701549038b63f9a3e9aad..1f9a73f74373e886931d4641799f21ff090d01dd 100755 (executable)
@@ -1479,7 +1479,7 @@ sub send_message {
                                                         SSL => 1);
                        }
                }
-               else {
+               elsif (!$smtp) {
                        $smtp_server_port ||= 25;
                        $smtp ||= Net::SMTP->new($smtp_server,
                                                 Hello => $smtp_domain,
@@ -1501,7 +1501,6 @@ sub send_message {
                                        $smtp->starttls(ssl_verify_params())
                                                or die sprintf(__("STARTTLS failed! %s"), IO::Socket::SSL::errstr());
                                }
-                               $smtp_encryption = '';
                                # Send EHLO again to receive fresh
                                # supported commands
                                $smtp->hello($smtp_domain);