From: Jean-Baptiste Rouault Date: Tue, 5 Jul 2011 15:30:09 +0000 (+0200) Subject: Fix compilation error when SASL support is disabled X-Git-Tag: v0.9.4-rc1~302 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11bd53e322b375bd81c553dbd4dc9fdd77cace5f;p=thirdparty%2Flibvirt.git Fix compilation error when SASL support is disabled This patch adds #if HAVE_SASL where needed in libvirtd.h --- diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h index 6c604fc1fb..8e1843c181 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;