[libvirt] [PATCH v2 12/14] rpc: Remove virNetServerClientNeedAuthLocked

[Marc Hartmayer]

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

Signed-off-by: Marc Hartmayer <mhart...@linux.vnet.ibm.com>
Reviewed-by: Boris Fiuczynski <fiu...@linux.vnet.ibm.com>
Reviewed-by: Stefan Zimmermann <s...@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 5436e3ec18a4..a950bed14efc 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 7786e3e2df8e..70e881b83a65 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -1566,18 +1566,11 @@ 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 c174e8285f0c..81eac6dcec88 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);
 
-- 
2.13.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list