[gentoo-commits] gentoo-x86 commit in net-fs/autofs/files: autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch

[gentoo-commits] gentoo-x86 commit in net-fs/autofs/files: autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch

[Justin Lecher (jlec)]

jlec        13/05/06 08:45:14

  Added:               
                        autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
  Log:
  net-fs/autofs: Add missing if statements for non-sasl ldap, #468606
  
  (Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

Revision  Changes    Path
1.1                  net-fs/autofs/files/autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/autofs/files/autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch?rev=1.1&content-type=text/plain

Index: autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
===================================================================
--- ./modules/lookup_ldap.c
+++ ./modules/lookup_ldap.c
@@ -591,10 +591,12 @@ static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context
 {
 	LDAP *ldap;
 
+#ifdef HAVE_SASL
 	if (ctxt->extern_cert && ctxt->extern_key) {
 		set_env(logopt, ENV_LDAPTLS_CERT, ctxt->extern_cert);
 		set_env(logopt, ENV_LDAPTLS_KEY, ctxt->extern_key);
 	}
+#endif
 
 	ldap = init_ldap_connection(logopt, uri, ctxt);
 	if (ldap) {
@@ -1372,10 +1374,12 @@ static void free_context(struct lookup_context *ctxt)
 		defaults_free_searchdns(ctxt->sdns);
 	if (ctxt->dclist)
 		free_dclist(ctxt->dclist);
+#ifdef HAVE_SASL
 	if (ctxt->extern_cert)
 		free(ctxt->extern_cert);
 	if (ctxt->extern_key)
 		free(ctxt->extern_key);
+#endif
 	free(ctxt);
 
 	return;
 modules/lookup_ldap.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index dbec753..ce1e2e5 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -28,7 +28,9 @@
 #include <arpa/nameser.h>
 #include <resolv.h>
 #include <lber.h>
+#ifdef HAVE_SASL
 #include <libxml/tree.h>
+#endif
 
 #define MODULE_LOOKUP
 #include "automount.h"