tls: fix typo and fix return value of GetLocalTlsPolicyFromConfiguration

bareos · Sep 24, 2018 · 86fb8ae · 86fb8ae
1 parent 03b6544
commit 86fb8ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/core/src/lib/tls_conf_base.cc b/core/src/lib/tls_conf_base.cc
@@ -37,8 +37,7 @@ uint32_t GetLocalTlsPolicyFromConfiguration(TlsResource *tls_resource)
 TlsConfigBase *SelectTlsFromPolicy(TlsResource *tls_resource, uint32_t remote_policy)
 {
   if (remote_policy == TlsConfigBase::BNET_TLS_AUTO) {
-    static TlsConfigAuto tls_auto_dummy;
-    return &tls_auto_dummy;
+    return &tls_resource->tls_cert;
   }
   uint32_t local_policy = GetLocalTlsPolicyFromConfiguration(tls_resource);
 

diff --git a/core/src/lib/tls_openssl.cc b/core/src/lib/tls_openssl.cc
@@ -98,7 +98,7 @@ bool TlsOpenSsl::init()
   SSL_CTX_set_default_passwd_cb_userdata(d_->openssl_ctx_, reinterpret_cast<void *>(d_.get()));
 
   const char *ca_certfile = d_->ca_certfile_.empty() ? nullptr : d_->ca_certfile_.c_str();
-  const char *ca_certdir  = d_->ca_certdir_.empty() ? nullptr : d_->ca_certfile_.c_str();
+  const char *ca_certdir  = d_->ca_certdir_.empty() ? nullptr : d_->ca_certdir_.c_str();
 
   if (ca_certfile || ca_certdir) { /* at least one should be set */
     if (!SSL_CTX_load_verify_locations(d_->openssl_ctx_, ca_certfile, ca_certdir)) {