From: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
Date: Thu, 21 Dec 2017 14:29:02 +0000 (+0100)
Subject: rpc: Refactor the condition whether a client needs authentication
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=be680bed4a8c51acebce012d7848d651f686105c;p=libvirt.git

rpc: Refactor the condition whether a client needs authentication

Add virNetServerClientAuthMethodImpliesAuthenticated() for deciding
whether a authentication method implies that a client is automatically
authenticated or not. Use this new function in
virNetServerClientNeedAuthLocked().

Signed-off-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
Reviewed-by: Stefan Zimmermann <stzi@linux.vnet.ibm.com>
---

diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 748132ae61..afe4fb47a2 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -354,6 +354,23 @@ static void virNetServerClientSockTimerFunc(int timer,
 }
 
 
+/**
+ * virNetServerClientAuthMethodImpliesAuthenticated:
+ * @auth: authentication method to check
+ *
+ * Check if the passed authentication method implies that a client is
+ * automatically authenticated.
+ *
+ * Returns true if @auth implies that a client is automatically
+ * authenticated, otherwise false.
+ */
+static bool
+virNetServerClientAuthMethodImpliesAuthenticated(int auth)
+{
+    return auth == VIR_NET_SERVER_SERVICE_AUTH_NONE;
+}
+
+
 static virNetServerClientPtr
 virNetServerClientNewInternal(unsigned long long id,
                               virNetSocketPtr sock,
@@ -1521,7 +1538,7 @@ int virNetServerClientSendMessage(virNetServerClientPtr client,
 bool
 virNetServerClientNeedAuthLocked(virNetServerClientPtr client)
 {
-    return !(client->auth == VIR_NET_SERVER_SERVICE_AUTH_NONE);
+    return !virNetServerClientAuthMethodImpliesAuthenticated(client->auth);
 }