From 4f6a654e9561646f8a6183507543c3cb847aba85 Mon Sep 17 00:00:00 2001
From: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
Date: Thu, 21 Dec 2017 15:29:07 +0100
Subject: [PATCH] rpc: Remove virNetServerClientNeedAuthLocked

'Squash' virNetServerClientNeedAuthLocked into
virNetServerClientNeedAuth and remove virNetServerClientNeedAuthLocked
as it's not longer needed.

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>
---
 src/libvirt_remote.syms      | 1 -
 src/rpc/virnetserverclient.c | 9 +--------
 src/rpc/virnetserverclient.h | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms
index 5436e3ec18..a950bed14e 100644
--- a/src/libvirt_remote.syms
+++ b/src/libvirt_remote.syms
@@ -144,7 +144,6 @@ virNetServerClientIsLocal;
 virNetServerClientIsSecure;
 virNetServerClientLocalAddrStringSASL;
 virNetServerClientNeedAuth;
-virNetServerClientNeedAuthLocked;
 virNetServerClientNew;
 virNetServerClientNewPostExecRestart;
 virNetServerClientPreExecRestart;
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 7786e3e2df..70e881b83a 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -1565,19 +1565,12 @@ int virNetServerClientSendMessage(virNetServerClientPtr client,
 }
 
 
-bool
-virNetServerClientNeedAuthLocked(virNetServerClientPtr client)
-{
-    return !virNetServerClientAuthMethodImpliesAuthenticated(client->auth);
-}
-
-
 bool
 virNetServerClientNeedAuth(virNetServerClientPtr client)
 {
     bool need;
     virObjectLock(client);
-    need = virNetServerClientNeedAuthLocked(client);
+    need = !virNetServerClientAuthMethodImpliesAuthenticated(client->auth);
     virObjectUnlock(client);
     return need;
 }
diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h
index c174e8285f..81eac6dcec 100644
--- a/src/rpc/virnetserverclient.h
+++ b/src/rpc/virnetserverclient.h
@@ -148,7 +148,6 @@ int virNetServerClientSendMessage(virNetServerClientPtr client,
                                   virNetMessagePtr msg);
 
 bool virNetServerClientNeedAuth(virNetServerClientPtr client);
-bool virNetServerClientNeedAuthLocked(virNetServerClientPtr client);
 bool virNetServerClientIsAuthPendingLocked(virNetServerClientPtr client);
 void virNetServerClientSetAuthPendingLocked(virNetServerClientPtr client, bool auth_pending);
 
-- 
GitLab