mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-22 03:12:22 +00:00
rpc: Replace virNetServerClientNeedAuth with virNetServerClientIsAuthenticated
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:
parent
4f6a654e95
commit
68cdad8785
@ -138,12 +138,12 @@ virNetServerClientGetUNIXIdentity;
|
||||
virNetServerClientImmediateClose;
|
||||
virNetServerClientInit;
|
||||
virNetServerClientInitKeepAlive;
|
||||
virNetServerClientIsAuthenticated;
|
||||
virNetServerClientIsAuthPendingLocked;
|
||||
virNetServerClientIsClosedLocked;
|
||||
virNetServerClientIsLocal;
|
||||
virNetServerClientIsSecure;
|
||||
virNetServerClientLocalAddrStringSASL;
|
||||
virNetServerClientNeedAuth;
|
||||
virNetServerClientNew;
|
||||
virNetServerClientNewPostExecRestart;
|
||||
virNetServerClientPreExecRestart;
|
||||
|
@ -1566,13 +1566,13 @@ int virNetServerClientSendMessage(virNetServerClientPtr client,
|
||||
|
||||
|
||||
bool
|
||||
virNetServerClientNeedAuth(virNetServerClientPtr client)
|
||||
virNetServerClientIsAuthenticated(virNetServerClientPtr client)
|
||||
{
|
||||
bool need;
|
||||
bool authenticated;
|
||||
virObjectLock(client);
|
||||
need = !virNetServerClientAuthMethodImpliesAuthenticated(client->auth);
|
||||
authenticated = virNetServerClientAuthMethodImpliesAuthenticated(client->auth);
|
||||
virObjectUnlock(client);
|
||||
return need;
|
||||
return authenticated;
|
||||
}
|
||||
|
||||
|
||||
|
@ -147,7 +147,7 @@ const char *virNetServerClientRemoteAddrStringURI(virNetServerClientPtr client);
|
||||
int virNetServerClientSendMessage(virNetServerClientPtr client,
|
||||
virNetMessagePtr msg);
|
||||
|
||||
bool virNetServerClientNeedAuth(virNetServerClientPtr client);
|
||||
bool virNetServerClientIsAuthenticated(virNetServerClientPtr client);
|
||||
bool virNetServerClientIsAuthPendingLocked(virNetServerClientPtr client);
|
||||
void virNetServerClientSetAuthPendingLocked(virNetServerClientPtr client, bool auth_pending);
|
||||
|
||||
|
@ -397,11 +397,10 @@ virNetServerProgramDispatchCall(virNetServerProgramPtr prog,
|
||||
goto error;
|
||||
}
|
||||
|
||||
/* If client is marked as needing auth, don't allow any RPC ops
|
||||
* which are except for authentication ones
|
||||
*/
|
||||
/* If the client is not authenticated, don't allow any RPC ops
|
||||
* which are except for authentication ones */
|
||||
if (dispatcher->needAuth &&
|
||||
virNetServerClientNeedAuth(client)) {
|
||||
!virNetServerClientIsAuthenticated(client)) {
|
||||
/* Explicitly *NOT* calling remoteDispatchAuthError() because
|
||||
we want back-compatibility with libvirt clients which don't
|
||||
support the VIR_ERR_AUTH_FAILED error code */
|
||||
|
Loading…
x
Reference in New Issue
Block a user