External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpc: Replace virNetServerClientNeedAuth with virNetServerClientIsAuthenticated

Browse Source 
Replace virNetServerClientNeedAuth with
virNetServerClientIsAuthenticated because it makes it clearer what it
means.

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>
This commit is contained in:
Marc Hartmayer 2017-12-21 15:29:08 +01:00 committed by John Ferlan
parent 4f6a654e95
commit 68cdad8785
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libvirt_remote.syms
View File

@ -138,12 +138,12 @@ virNetServerClientGetUNIXIdentity;
virNetServerClientImmediateClose; virNetServerClientImmediateClose;
virNetServerClientInit; virNetServerClientInit;
virNetServerClientInitKeepAlive; virNetServerClientInitKeepAlive;
virNetServerClientIsAuthenticated;
virNetServerClientIsAuthPendingLocked; virNetServerClientIsAuthPendingLocked;
virNetServerClientIsClosedLocked; virNetServerClientIsClosedLocked;
virNetServerClientIsLocal; virNetServerClientIsLocal;
virNetServerClientIsSecure; virNetServerClientIsSecure;
virNetServerClientLocalAddrStringSASL; virNetServerClientLocalAddrStringSASL;
virNetServerClientNeedAuth;
virNetServerClientNew; virNetServerClientNew;
virNetServerClientNewPostExecRestart; virNetServerClientNewPostExecRestart;
virNetServerClientPreExecRestart; virNetServerClientPreExecRestart;

8
src/rpc/virnetserverclient.c
View File

@ -1566,13 +1566,13 @@ int virNetServerClientSendMessage(virNetServerClientPtr client,
bool bool
virNetServerClientNeedAuth(virNetServerClientPtr client) virNetServerClientIsAuthenticated(virNetServerClientPtr client)
{ {
bool need; bool authenticated;
virObjectLock(client); virObjectLock(client);
need = !virNetServerClientAuthMethodImpliesAuthenticated(client->auth); authenticated = virNetServerClientAuthMethodImpliesAuthenticated(client->auth);
virObjectUnlock(client); virObjectUnlock(client);
return need; return authenticated;
} }

2
src/rpc/virnetserverclient.h
View File

@ -147,7 +147,7 @@ const char *virNetServerClientRemoteAddrStringURI(virNetServerClientPtr client);
int virNetServerClientSendMessage(virNetServerClientPtr client, int virNetServerClientSendMessage(virNetServerClientPtr client,
virNetMessagePtr msg); virNetMessagePtr msg);
bool virNetServerClientNeedAuth(virNetServerClientPtr client); bool virNetServerClientIsAuthenticated(virNetServerClientPtr client);
bool virNetServerClientIsAuthPendingLocked(virNetServerClientPtr client); bool virNetServerClientIsAuthPendingLocked(virNetServerClientPtr client);
void virNetServerClientSetAuthPendingLocked(virNetServerClientPtr client, bool auth_pending); void virNetServerClientSetAuthPendingLocked(virNetServerClientPtr client, bool auth_pending);

7
src/rpc/virnetserverprogram.c
View File

@ -397,11 +397,10 @@ virNetServerProgramDispatchCall(virNetServerProgramPtr prog,
goto error; goto error;
} }
/* If client is marked as needing auth, don't allow any RPC ops /* If the client is not authenticated, don't allow any RPC ops
* which are except for authentication ones * which are except for authentication ones */
*/
if (dispatcher->needAuth && if (dispatcher->needAuth &&
virNetServerClientNeedAuth(client)) { !virNetServerClientIsAuthenticated(client)) {
/* Explicitly *NOT* calling remoteDispatchAuthError() because /* Explicitly *NOT* calling remoteDispatchAuthError() because
we want back-compatibility with libvirt clients which don't we want back-compatibility with libvirt clients which don't
support the VIR_ERR_AUTH_FAILED error code */ support the VIR_ERR_AUTH_FAILED error code */