[libvirt] [PATCH 7/7] Rename virNetServerClient*AddrString

Add SASL at the end to make the format obvious. --- daemon/remote.c | 4 ++-- src/libvirt_remote.syms | 4 ++-- src/rpc/virnetserverclient.c | 4 ++-- src/rpc/virnetserverclient.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index ea4753f..5ee82bb 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -3028,8 +3028,8 @@ remoteDispatchAuthSaslInit(virNetServerPtr server ATTRIBUTE_UNUSED, sasl = virNetSASLSessionNewServer(saslCtxt, "libvirt", - virNetServerClientLocalAddrString(client), - virNetServerClientRemoteAddrString(client)); + virNetServerClientLocalAddrStringSASL(client), + virNetServerClientRemoteAddrStringSASL(client)); if (!sasl) goto authfail; diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms index 3858f4d..a6192ef 100644 --- a/src/libvirt_remote.syms +++ b/src/libvirt_remote.syms @@ -139,12 +139,12 @@ virNetServerClientInitKeepAlive; virNetServerClientIsClosed; virNetServerClientIsLocal; virNetServerClientIsSecure; -virNetServerClientLocalAddrString; +virNetServerClientLocalAddrStringSASL; virNetServerClientNeedAuth; virNetServerClientNew; virNetServerClientNewPostExecRestart; virNetServerClientPreExecRestart; -virNetServerClientRemoteAddrString; +virNetServerClientRemoteAddrStringSASL; virNetServerClientRemoteAddrStringURI; virNetServerClientRemoveFilter; virNetServerClientSendMessage; diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 5aa7634..39fe860 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -903,7 +903,7 @@ void virNetServerClientSetDispatcher(virNetServerClientPtr client, } -const char *virNetServerClientLocalAddrString(virNetServerClientPtr client) +const char *virNetServerClientLocalAddrStringSASL(virNetServerClientPtr client) { if (!client->sock) return NULL; @@ -911,7 +911,7 @@ const char *virNetServerClientLocalAddrString(virNetServerClientPtr client) } -const char *virNetServerClientRemoteAddrString(virNetServerClientPtr client) +const char *virNetServerClientRemoteAddrStringSASL(virNetServerClientPtr client) { if (!client->sock) return NULL; diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h index bb9c937..c243a68 100644 --- a/src/rpc/virnetserverclient.h +++ b/src/rpc/virnetserverclient.h @@ -138,8 +138,8 @@ bool virNetServerClientCheckKeepAlive(virNetServerClientPtr client, virNetMessagePtr msg); int virNetServerClientStartKeepAlive(virNetServerClientPtr client); -const char *virNetServerClientLocalAddrString(virNetServerClientPtr client); -const char *virNetServerClientRemoteAddrString(virNetServerClientPtr client); +const char *virNetServerClientLocalAddrStringSASL(virNetServerClientPtr client); +const char *virNetServerClientRemoteAddrStringSASL(virNetServerClientPtr client); const char *virNetServerClientRemoteAddrStringURI(virNetServerClientPtr client); int virNetServerClientSendMessage(virNetServerClientPtr client, -- 2.7.3