[Libreoffice-commits] buildbot.git: tb/tb_send_email

Jan Holesovsky kendy at suse.cz
Tue Jul 9 01:28:41 PDT 2013


 tb/tb_send_email |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 7fed43a1b7b7ef26eee628e1681e8acc619b58e8
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jul 9 09:45:24 2013 +0200

    Workaround cygwin's problem with SSL initialization in tb_send_email too.

diff --git a/tb/tb_send_email b/tb/tb_send_email
index a9da068..8a4fc03 100755
--- a/tb/tb_send_email
+++ b/tb/tb_send_email
@@ -1903,7 +1903,10 @@ else {
     if ($conf{'tls_server'} == 1 and $conf{'tls_client'} == 1 and $opt{'tls'} =~ /^(yes|auto)$/) {
         printmsg("DEBUG => Starting TLS", 2);
         if (SMTPchat('STARTTLS')) { quit($conf{'error'}, 1); }
-        if (! IO::Socket::SSL->start_SSL($SERVER, SSL_version => 'SSLv3 TLSv1')) {
+        my $ssl_ver = 'SSLv3 TLSv1';
+        chomp(my $system = `uname -o`);
+        if ($system eq 'Cygwin') { $ssl_ver = 'SSLv3'; }
+        if (! IO::Socket::SSL->start_SSL($SERVER, SSL_version => $ssl_ver)) {
             quit("ERROR => TLS setup failed: " . IO::Socket::SSL::errstr(), 1);
         }
         printmsg("DEBUG => TLS: Using cipher: ". $SERVER->get_cipher(), 3);


More information about the Libreoffice-commits mailing list