On 12/12/2017 06:36 AM, Marc Hartmayer wrote:
> 'Squash' virNetServerClientNeedAuthLocked into
> virNetServerClientNeedAuth and remove virNetServerClientNeedAuthLocked
> as it's not longer needed.
>
> Signed-off-by: Marc Hartmayer <mhartmay@xxxxxxxxxxxxxxxxxx>
> Reviewed-by: Boris Fiuczynski <fiuczy@xxxxxxxxxxxxxxxxxx>
> Reviewed-by: Stefan Zimmermann <stzi@xxxxxxxxxxxxxxxxxx>
> ---
> src/libvirt_remote.syms | 1 -
> src/rpc/virnetserverclient.c | 10 +---------
> src/rpc/virnetserverclient.h | 1 -
> 3 files changed, 1 insertion(+), 11 deletions(-)
>
I have a feeling this may change given the comments already - so I'll
stop here.
John
> diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms
> index cef2794e1122..10583dc241ad 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 5224bc7de1d5..81dfc41a5967 100644
> --- a/src/rpc/virnetserverclient.c
> +++ b/src/rpc/virnetserverclient.c
> @@ -1550,20 +1550,12 @@ int virNetServerClientSendMessage(virNetServerClientPtr client,
> }
>
>
> -/* The caller must hold the lock for @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 f608682dc600..6f20ab4c06a0 100644
> --- a/src/rpc/virnetserverclient.h
> +++ b/src/rpc/virnetserverclient.h
> @@ -147,7 +147,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);
>
>
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
