From: Daniel P. Berrangé <berrange@redhat.com>
Date: Tue, 25 Jun 2019 16:32:29 +0000 (+0100)
Subject: remote: simplify libvirtd code for deciding if SASL auth is needed
X-Git-Tag: v5.6.0-rc1~239
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9095c328a2f0aa13969ddc8ef6e397388fecaf5;p=thirdparty%2Flibvirt.git

remote: simplify libvirtd code for deciding if SASL auth is needed

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index fdc9e4333a..0dabd3dff8 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -534,15 +534,10 @@ daemonSetupNetworking(virNetServerPtr srv,
     }
 
 #if WITH_SASL
-    if (config->auth_unix_rw == REMOTE_AUTH_SASL ||
-        (sock_path_ro && config->auth_unix_ro == REMOTE_AUTH_SASL) ||
-        (ipsock && config->listen_tls && config->auth_tls == REMOTE_AUTH_SASL) ||
-        (ipsock && config->listen_tcp && config->auth_tcp == REMOTE_AUTH_SASL)) {
-        saslCtxt = virNetSASLContextNewServer(
-            (const char *const*)config->sasl_allowed_username_list);
-        if (!saslCtxt)
+    if (virNetServerNeedsAuth(srv, REMOTE_AUTH_SASL) &&
+        !(saslCtxt = virNetSASLContextNewServer(
+              (const char *const*)config->sasl_allowed_username_list)))
             goto cleanup;
-    }
 #endif
 
     ret = 0;