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

[Matúš Kukan]

 bin/sendEmail    |    2 --
 tb/tb_send_email |    4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 6d3435b4578eb5fc3d52773ab5a36bf7dd4d633f
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Jan 24 19:53:27 2015 +0100

    Make tb/tb_send_email and bin/sendEmail the same
    
    Apply b855d0a95e74b6ab04d5e5e714ebbfebb7881c31 also to tb/tb_send_email
    and remove now not needed check for cygwin in both.

diff --git a/bin/sendEmail b/bin/sendEmail
index 07b6dd7..8487be8 100755
--- a/bin/sendEmail
+++ b/bin/sendEmail
@@ -1904,8 +1904,6 @@ else {
         printmsg("DEBUG => Starting TLS", 2);
         if (SMTPchat('STARTTLS')) { quit($conf{'error'}, 1); }
         my $ssl_ver = 'SSLv3';
-        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);
         }
diff --git a/tb/tb_send_email b/tb/tb_send_email
index 841e6ed..8487be8 100755
--- a/tb/tb_send_email
+++ b/tb/tb_send_email
@@ -1903,9 +1903,7 @@ 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); }
-        my $ssl_ver = 'SSLv3 TLSv1';
-        chomp(my $system = `uname`);
-        if ($system =~ /CYGWIN/) { $ssl_ver = 'SSLv3'; }
+        my $ssl_ver = 'SSLv3';
         if (! IO::Socket::SSL->start_SSL($SERVER, SSL_version => $ssl_ver)) {
             quit("ERROR => TLS setup failed: " . IO::Socket::SSL::errstr(), 1);
         }