From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 4 Jun 2018 05:11:00 +0000 (+0200)
Subject: src: Dissolve libvirt_gnutls.syms in libvirt_remote.syms
X-Git-Tag: v4.5.0-rc1~256
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3700dd53c3e4890b18b9962955cdf3440dce9746;p=thirdparty%2Flibvirt.git

src: Dissolve libvirt_gnutls.syms in libvirt_remote.syms

Now that GnuTLS is required these symbols are going to be present
all the time.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/Makefile.am b/src/Makefile.am
index b2db1e9db9..db8c8ebd1a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -453,12 +453,6 @@ else ! WITH_SASL
 SYM_FILES += $(srcdir)/libvirt_sasl.syms
 endif ! WITH_SASL
 
-if WITH_GNUTLS
-USED_SYM_FILES += $(srcdir)/libvirt_gnutls.syms
-else ! WITH_GNUTLS
-SYM_FILES += $(srcdir)/libvirt_gnutls.syms
-endif ! WITH_GNUTLS
-
 if WITH_SSH2
 USED_SYM_FILES += $(srcdir)/libvirt_libssh2.syms
 else ! WITH_SSH2
diff --git a/src/libvirt_gnutls.syms b/src/libvirt_gnutls.syms
deleted file mode 100644
index 1adf3af164..0000000000
--- a/src/libvirt_gnutls.syms
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# GNUTLS-specific symbols
-#
-
-# rpc/virnetclient.h
-virNetClientGetTLSKeySize;
-virNetClientSetTLSSession;
-
-
-# rpc/virnetserver.h
-virNetServerSetTLSContext;
-
-
-# rpc/virnetserverclient.h
-virNetServerClientGetTLSKeySize;
-virNetServerClientGetTLSSession;
-virNetServerClientHasTLSSession;
-
-
-# rpc/virnetserverservice.h
-virNetServerServiceGetTLSContext;
-
-
-# rpc/virnetsocket.h
-virNetSocketSetTLSSession;
-
-
-# Let emacs know we want case-insensitive sorting
-# Local Variables:
-# sort-fold-case: t
-# End:
diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms
index cab93ab27f..9a33626ec6 100644
--- a/src/libvirt_remote.syms
+++ b/src/libvirt_remote.syms
@@ -20,6 +20,7 @@ virNetClientAddStream;
 virNetClientClose;
 virNetClientDupFD;
 virNetClientGetFD;
+virNetClientGetTLSKeySize;
 virNetClientHasPassFD;
 virNetClientIsEncrypted;
 virNetClientIsOpen;
@@ -41,6 +42,7 @@ virNetClientSendNoReply;
 virNetClientSendWithReply;
 virNetClientSendWithReplyStream;
 virNetClientSetCloseCallback;
+virNetClientSetTLSSession;
 
 
 # rpc/virnetclientprogram.h
@@ -130,6 +132,7 @@ virNetServerProcessClients;
 virNetServerSetClientAuthenticated;
 virNetServerSetClientLimits;
 virNetServerSetThreadPoolParameters;
+virNetServerSetTLSContext;
 virNetServerStart;
 virNetServerUpdateServices;
 
@@ -148,8 +151,11 @@ virNetServerClientGetPrivateData;
 virNetServerClientGetReadonly;
 virNetServerClientGetSELinuxContext;
 virNetServerClientGetTimestamp;
+virNetServerClientGetTLSKeySize;
+virNetServerClientGetTLSSession;
 virNetServerClientGetTransport;
 virNetServerClientGetUNIXIdentity;
+virNetServerClientHasTLSSession;
 virNetServerClientImmediateClose;
 virNetServerClientInit;
 virNetServerClientInitKeepAlive;
@@ -207,6 +213,7 @@ virNetServerServiceClose;
 virNetServerServiceGetAuth;
 virNetServerServiceGetMaxRequests;
 virNetServerServiceGetPort;
+virNetServerServiceGetTLSContext;
 virNetServerServiceIsReadonly;
 virNetServerServiceNewFD;
 virNetServerServiceNewFDOrUNIX;
@@ -253,6 +260,7 @@ virNetSocketRemoteAddrStringURI;
 virNetSocketRemoveIOCallback;
 virNetSocketSendFD;
 virNetSocketSetBlocking;
+virNetSocketSetTLSSession;
 virNetSocketUpdateIOCallback;
 virNetSocketWrite;