From: Dustin Polke <DuPol@xxxxxx> See https://bugs.gentoo.org/show_bug.cgi?id=361899 for more info. Edited by: Ian Kent <raven@xxxxxxxxxx> - fix parse_ldap_config() is needed by ldap but previously excluded. - exclude other references to ctxt->extern_cert and ctxt->extern_key. - prevent memory leak if present in config but not used. - remove now unused set_env(). --- CHANGELOG | 1 + include/lookup_ldap.h | 4 ++-- lib/Makefile | 4 ++++ modules/Makefile | 6 ++++-- modules/lookup_ldap.c | 18 +++++++++++++----- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index dd6fc1a..5764cb0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -67,6 +67,7 @@ - remove hard-coded STRIP variable. - use LIBS for link libraries. - unbundle NOTSTRIP from DEBUG so they dont depend on each other. +- fix compilation of lookup_ldap.c without sasl. 25/07/2012 autofs-5.0.7 ======================= diff --git a/include/lookup_ldap.h b/include/lookup_ldap.h index 9a4ce73..f34c029 100644 --- a/include/lookup_ldap.h +++ b/include/lookup_ldap.h @@ -11,6 +11,8 @@ #include <krb5.h> #endif +#include <libxml/tree.h> + #include "list.h" #include "dclist.h" @@ -92,7 +94,6 @@ struct lookup_context { }; -#ifdef WITH_SASL #define LDAP_AUTH_CONF_FILE "test" #define LDAP_TLS_DONT_USE 0 @@ -104,7 +105,6 @@ struct lookup_context { #define LDAP_AUTH_REQUIRED 0x0002 #define LDAP_AUTH_AUTODETECT 0x0004 #define LDAP_NEED_AUTH (LDAP_AUTH_REQUIRED|LDAP_AUTH_AUTODETECT) -#endif #define LDAP_AUTH_USESIMPLE 0x0008 diff --git a/lib/Makefile b/lib/Makefile index 314779b..518b483 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -24,6 +24,10 @@ CFLAGS += -I../include -fPIC -D_GNU_SOURCE CFLAGS += -DAUTOFS_MAP_DIR=\"$(autofsmapdir)\" CFLAGS += -DAUTOFS_CONF_DIR=\"$(autofsconfdir)\" +ifeq ($(LDAP), 1) + CFLAGS += $(XML_FLAGS) $(XML_LIBS) +endif + .PHONY: all install clean all: autofs.a diff --git a/modules/Makefile b/modules/Makefile index de01ebd..8610783 100644 --- a/modules/Makefile +++ b/modules/Makefile @@ -45,10 +45,12 @@ endif ifeq ($(LDAP), 1) SRCS += lookup_ldap.c MODS += lookup_ldap.so + LDAP_FLAGS += $(XML_FLAGS) -DLDAP_THREAD_SAFE + LIBLDAP += $(XML_LIBS) ifeq ($(SASL), 1) SASL_OBJ = cyrus-sasl.o cyrus-sasl-extern.o - LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) $(KRB5_FLAGS) -DLDAP_THREAD_SAFE - LIBLDAP += $(LIBSASL) $(XML_LIBS) $(KRB5_LIBS) + LDAP_FLAGS += $(SASL_FLAGS) $(KRB5_FLAGS) + LIBLDAP += $(LIBSASL) $(KRB5_LIBS) endif endif diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c index 655e9fa..d05098f 100644 --- a/modules/lookup_ldap.c +++ b/modules/lookup_ldap.c @@ -72,6 +72,7 @@ struct ldap_search_params { static int decode_percent_hack(const char *, char **); +#ifdef WITH_SASL static int set_env(unsigned logopt, const char *name, const char *val) { int ret = setenv(name, val, 1); @@ -81,6 +82,7 @@ static int set_env(unsigned logopt, const char *name, const char *val) } return 1; } +#endif #ifndef HAVE_LDAP_CREATE_PAGE_CONTROL int ldap_create_page_control(LDAP *ldap, ber_int_t pagesize, @@ -205,9 +207,9 @@ int unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *c { int rv; -#ifdef WITH_SASL if (ctxt->use_tls == LDAP_TLS_RELEASE) ctxt->use_tls = LDAP_TLS_INIT; +#ifdef WITH_SASL autofs_sasl_unbind(ctxt); #endif @@ -265,7 +267,6 @@ LDAP *__init_ldap_connection(unsigned logopt, const char *uri, struct lookup_con info(logopt, MODPREFIX "failed to set connection timeout to %d", net_timeout.tv_sec); -#ifdef WITH_SASL if (ctxt->use_tls) { if (ctxt->version == 2) { if (ctxt->tls_required) { @@ -294,7 +295,6 @@ LDAP *__init_ldap_connection(unsigned logopt, const char *uri, struct lookup_con } ctxt->use_tls = LDAP_TLS_RELEASE; } -#endif return ldap; } @@ -618,10 +618,12 @@ static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context { LDAP *ldap; +#ifdef WITH_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) { @@ -824,7 +826,6 @@ find_server: return ldap; } -#ifdef WITH_SASL int get_property(unsigned logopt, xmlNodePtr node, const char *prop, char **value) { xmlChar *ret; @@ -845,6 +846,7 @@ int get_property(unsigned logopt, xmlNodePtr node, const char *prop, char **valu return 0; } +#ifdef WITH_SASL /* * For plain text, login and digest-md5 authentication types, we need * user and password credentials. @@ -857,6 +859,7 @@ int authtype_requires_creds(const char *authtype) return 1; return 0; } +#endif /* * Returns: @@ -1089,6 +1092,7 @@ auth_fail: } } else if (auth_required == LDAP_AUTH_REQUIRED && (authtype && !strncmp(authtype, "EXTERNAL", 8))) { +#ifdef WITH_SASL ret = get_property(logopt, root, "external_cert", &extern_cert); ret |= get_property(logopt, root, "external_key", &extern_key); /* @@ -1107,6 +1111,7 @@ auth_fail: if (extern_key) free(extern_key); } +#endif } /* @@ -1127,8 +1132,10 @@ auth_fail: ctxt->secret = secret; ctxt->client_princ = client_princ; ctxt->client_cc = client_cc; +#ifdef WITH_SASL ctxt->extern_cert = extern_cert; ctxt->extern_key = extern_key; +#endif debug(logopt, MODPREFIX "ldap authentication configured with the following options:"); @@ -1160,7 +1167,6 @@ out: return ret; } -#endif /* * Take an input string as specified in the master map, and break it @@ -1423,10 +1429,12 @@ static void free_context(struct lookup_context *ctxt) defaults_free_searchdns(ctxt->sdns); if (ctxt->dclist) free_dclist(ctxt->dclist); +#ifdef WITH_SASL if (ctxt->extern_cert) free(ctxt->extern_cert); if (ctxt->extern_key) free(ctxt->extern_key); +#endif free(ctxt); return; -- To unsubscribe from this list: send the line "unsubscribe autofs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
