From: Daniel P. Berrange <berrange@redhat.com>
Date: Wed, 15 Aug 2012 20:41:42 +0000 (+0100)
Subject: Move some SASL symbols into libvirt_sasl.syms
X-Git-Tag: v0.10.0-rc1~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eed537c5df831cd5de36e2c864999803edffaa93;p=thirdparty%2Flibvirt.git

Move some SASL symbols into libvirt_sasl.syms

Previous commit:

  commit 9093ab77345767f741304aa0adb02adbbe766f14
  Author: Daniel P. Berrange <berrange@redhat.com>
  Date:   Wed Jul 18 17:03:17 2012 +0100

    Add lots of internal symbols to libvirt_private.syms

mistakenly put some conditional SASL symbols in libvirt_private.syms
instead of libvirt_sasl.syms
---

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d5912ed0cd..e91540d546 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1337,7 +1337,6 @@ virNetClientSendNonBlock;
 virNetClientSendWithReply;
 virNetClientSendWithReplyStream;
 virNetClientSetCloseCallback;
-virNetClientSetSASLSession;
 virNetClientSetTLSSession;
 
 
@@ -1485,16 +1484,6 @@ virNetMessageSaveError;
 xdr_virNetMessageError;
 
 
-# virnetsaslcontext.h
-virNetSASLContextNewClient;
-virNetSASLSessionClientStart;
-virNetSASLSessionClientStep;
-virNetSASLSessionDecode;
-virNetSASLSessionEncode;
-virNetSASLSessionGetMaxBufSize;
-virNetSASLSessionNewClient;
-
-
 # virnetserver.h
 virNetServerAddProgram;
 virNetServerAddService;
@@ -1606,7 +1595,6 @@ virNetSocketRemoteAddrString;
 virNetSocketRemoveIOCallback;
 virNetSocketSendFD;
 virNetSocketSetBlocking;
-virNetSocketSetSASLSession;
 virNetSocketSetTLSSession;
 virNetSocketUpdateIOCallback;
 virNetSocketWrite;
diff --git a/src/libvirt_sasl.syms b/src/libvirt_sasl.syms
index cc46c0d9db..95c1610a32 100644
--- a/src/libvirt_sasl.syms
+++ b/src/libvirt_sasl.syms
@@ -2,13 +2,23 @@
 # SASL-specific symbols
 #
 
+# virnetclient.h
+virNetClientSetSASLSession;
+
 # virnetsaslcontext.h
 virNetSASLContextCheckIdentity;
+virNetSASLContextNewClient;
 virNetSASLContextNewServer;
+virNetSASLSessionClientStart;
+virNetSASLSessionClientStep;
+virNetSASLSessionDecode;
+virNetSASLSessionEncode;
 virNetSASLSessionExtKeySize;
 virNetSASLSessionGetIdentity;
 virNetSASLSessionGetKeySize;
+virNetSASLSessionGetMaxBufSize;
 virNetSASLSessionListMechanisms;
+virNetSASLSessionNewClient;
 virNetSASLSessionNewServer;
 virNetSASLSessionSecProps;
 virNetSASLSessionServerStart;
@@ -17,3 +27,7 @@ virNetSASLSessionServerStep;
 
 # virnetserverclient.h
 virNetServerClientSetSASLSession;
+
+
+# virnetsocket.h
+virNetSocketSetSASLSession;