[libvirt] [PATCH] Fix compilation error when SASL support is disabled
This patch adds #if HAVE_SASL where needed in libvirtd.h --- daemon/libvirtd.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h index 6c604fc..8e1843c 100644 --- a/daemon/libvirtd.h +++ b/daemon/libvirtd.h @@ -38,7 +38,9 @@ # include "logging.h" # include "threads.h" # include "network.h" -# include "virnetsaslcontext.h" +# if HAVE_SASL +# include "virnetsaslcontext.h" +# endif # include "virnetserverprogram.h" # if WITH_DTRACE @@ -70,7 +72,9 @@ struct daemonClientPrivate { int domainEventCallbackID[VIR_DOMAIN_EVENT_ID_LAST]; +# if HAVE_SASL virNetSASLSessionPtr sasl; +# endif /* This is only valid if a remote open call has been made on this * connection, otherwise it will be NULL. Also if remote close is @@ -81,7 +85,9 @@ struct daemonClientPrivate { daemonClientStreamPtr streams; }; +# if HAVE_SASL extern virNetSASLContextPtr saslCtxt; +# endif extern virNetServerProgramPtr remoteProgram; extern virNetServerProgramPtr qemuProgram; -- 1.7.5.4
On Tue, Jul 05, 2011 at 05:30:09PM +0200, Jean-Baptiste Rouault wrote:
This patch adds #if HAVE_SASL where needed in libvirtd.h --- daemon/libvirtd.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
This was already fixed last week commit 0e4b921a57b670bbe55c27d17ca19aa5780ee196 Author: Daniel P. Berrange <berrange@redhat.com> Date: Thu Jun 30 18:18:08 2011 +0100 Add conditionals to allow build without SASL * daemon/libvirtd.c, daemon/remote.c: Add #if HAVE_SASL and suitable function stubs to allow build without SASL Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
On Tuesday 05 July 2011 17:43:06 Daniel P. Berrange wrote:
On Tue, Jul 05, 2011 at 05:30:09PM +0200, Jean-Baptiste Rouault wrote:
This patch adds #if HAVE_SASL where needed in libvirtd.h ---
daemon/libvirtd.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
This was already fixed last week
commit 0e4b921a57b670bbe55c27d17ca19aa5780ee196 Author: Daniel P. Berrange <berrange@redhat.com> Date: Thu Jun 30 18:18:08 2011 +0100
Add conditionals to allow build without SASL
* daemon/libvirtd.c, daemon/remote.c: Add #if HAVE_SASL and suitable function stubs to allow build without SASL
Daniel
Hi, The patch you are referring to adds conditionals to libvirtd.c and remote.c. My patch adds conditionals to the libvirtd.h file because it includes virnetsaslcontext.h and uses SASL-related types and libvirt fails to build with "--without-sasl" flag. Regards, Jean-Baptiste -- Jean-Baptiste ROUAULT Ingénieur R&D - Diateam : Architectes de l'information Phone : +33 (0)9 53 16 02 70 Fax : +33 (0)2 98 050 051
2011/7/5 Jean-Baptiste Rouault <jean-baptiste.rouault@diateam.net>:
On Tuesday 05 July 2011 17:43:06 Daniel P. Berrange wrote:
On Tue, Jul 05, 2011 at 05:30:09PM +0200, Jean-Baptiste Rouault wrote:
This patch adds #if HAVE_SASL where needed in libvirtd.h ---
daemon/libvirtd.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
This was already fixed last week
commit 0e4b921a57b670bbe55c27d17ca19aa5780ee196 Author: Daniel P. Berrange <berrange@redhat.com> Date: Thu Jun 30 18:18:08 2011 +0100
Add conditionals to allow build without SASL
* daemon/libvirtd.c, daemon/remote.c: Add #if HAVE_SASL and suitable function stubs to allow build without SASL
Daniel
Hi,
The patch you are referring to adds conditionals to libvirtd.c and remote.c. My patch adds conditionals to the libvirtd.h file because it includes virnetsaslcontext.h and uses SASL-related types and libvirt fails to build with "--without-sasl" flag.
Regards, Jean-Baptiste
I can reproduce this, but I need to uninstall the SASL header for that. Just compiling with --without-sasl but the SASL headers installed works. Also libvirtd.h is the only place that includes virnetsaslcontext.h unconditional. So this patch is correct and necessary. I've pushed it. -- Matthias Bolte http://photron.blogspot.com
participants (3)
-
Daniel P. Berrange -
Jean-Baptiste Rouault -
Matthias Bolte