Fix problems that showed up in Fedora 29

bareos · Nov 9, 2018 · 404be80 · 404be80
1 parent d024e16
commit 404be80
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/core/src/dird/ua_cmds.cc b/core/src/dird/ua_cmds.cc
@@ -474,7 +474,7 @@ bool Do_a_command(UaContext *ua)
       return false;
    }
 
-   while (ua->jcr->res.wstorage->size()) {
+   while (ua->jcr->res.wstorage && ua->jcr->res.wstorage->size()) {
       ua->jcr->res.wstorage->remove(0);
    }
 

diff --git a/core/src/lib/tls_openssl_private.cc b/core/src/lib/tls_openssl_private.cc
@@ -49,6 +49,7 @@ TlsOpenSslPrivate::TlsOpenSslPrivate()
     , tcp_file_descriptor_(0)
     , pem_callback_(nullptr)
     , pem_userdata_(nullptr)
+    , verify_peer_ (false)
 {
   Dmsg0(100, "Construct TlsOpenSslPrivate\n");
 }

diff --git a/core/src/lib/try_tls_handshake_as_a_server.cc b/core/src/lib/try_tls_handshake_as_a_server.cc
@@ -47,8 +47,8 @@ static bool CheckForCleartextConnection(BareosSocket *bs, ConfigurationParser *c
     Dmsg0(100, "Client wants tls connection but cleartext is configured\n");
     return false;
   }
-  Dmsg0(100, "Client and Server want cleartext connection\n");
   do_cleartext = cleartext_configured; /* this covers the other two cases */
+  Dmsg1(100, "Client and Server want %s connection\n", do_cleartext ? "cleartext" : "tls");
   return true;
 }