Add SASL at the end to make the format obvious.
---
src/libvirt_remote.syms | 4 ++--
src/remote/remote_driver.c | 4 ++--
src/rpc/virnetclient.c | 4 ++--
src/rpc/virnetclient.h | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms
index a6192ef..ca1f3ac 100644
--- a/src/libvirt_remote.syms
+++ b/src/libvirt_remote.syms
@@ -17,7 +17,7 @@ virNetClientIsOpen;
virNetClientKeepAliveIsSupported;
virNetClientKeepAliveStart;
virNetClientKeepAliveStop;
-virNetClientLocalAddrString;
+virNetClientLocalAddrStringSASL;
virNetClientNewExternal;
virNetClientNewLibSSH2;
virNetClientNewSSH;
@@ -25,7 +25,7 @@ virNetClientNewTCP;
virNetClientNewUNIX;
virNetClientRegisterAsyncIO;
virNetClientRegisterKeepAlive;
-virNetClientRemoteAddrString;
+virNetClientRemoteAddrStringSASL;
virNetClientRemoveStream;
virNetClientSendNonBlock;
virNetClientSendNoReply;
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index b11bfe0..1f81f03 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -3831,8 +3831,8 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv,
if (!(sasl = virNetSASLSessionNewClient(saslCtxt,
"libvirt",
priv->hostname,
-
virNetClientLocalAddrString(priv->client),
-
virNetClientRemoteAddrString(priv->client),
+
virNetClientLocalAddrStringSASL(priv->client),
+
virNetClientRemoteAddrStringSASL(priv->client),
saslcb)))
goto cleanup;
/* saslcb is now owned by sasl */
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index c43cd08..361dc1a 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -944,12 +944,12 @@ void virNetClientRemoveStream(virNetClientPtr client,
}
-const char *virNetClientLocalAddrString(virNetClientPtr client)
+const char *virNetClientLocalAddrStringSASL(virNetClientPtr client)
{
return virNetSocketLocalAddrStringSASL(client->sock);
}
-const char *virNetClientRemoteAddrString(virNetClientPtr client)
+const char *virNetClientRemoteAddrStringSASL(virNetClientPtr client)
{
return virNetSocketRemoteAddrStringSASL(client->sock);
}
diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h
index 38f929c..c772d0b 100644
--- a/src/rpc/virnetclient.h
+++ b/src/rpc/virnetclient.h
@@ -121,8 +121,8 @@ int virNetClientSetTLSSession(virNetClientPtr client,
bool virNetClientIsEncrypted(virNetClientPtr client);
bool virNetClientIsOpen(virNetClientPtr client);
-const char *virNetClientLocalAddrString(virNetClientPtr client);
-const char *virNetClientRemoteAddrString(virNetClientPtr client);
+const char *virNetClientLocalAddrStringSASL(virNetClientPtr client);
+const char *virNetClientRemoteAddrStringSASL(virNetClientPtr client);
# ifdef WITH_GNUTLS
int virNetClientGetTLSKeySize(virNetClientPtr client);
--
2.7.3