[PATCH 5/6] add missing WITH_SASL in modules lookup_ldap.c

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: "Lan Yixun (dlan)" <dennis.yxun@xxxxxxxxx>

---
Gentoo Bugs:
 https://bugs.gentoo.org/show_bug.cgi?id=361899

x86_64-pc-linux-gnu-gcc -Wl,-O1 -Wl,--as-needed -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common
-shared -O2 -pipe -march=core2 -mcx16 -msahf -mpopcnt -msse4.2 --param l1-cache-size=32 --param
l1-cache-line-size=64 --param l2-cache-size=8192 -frecord-gcc-switches -g
-Wimplicit-function-declaration -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_REENTRANT
-D_FILE_OFFSET_BITS=64 -I../include -I../lib -fPIC -D_GNU_SOURCE
-DAUTOFS_LIB_DIR=\"/usr/lib64/autofs\" -DAUTOFS_MAP_DIR=\"/etc/autofs\" -DLDAP_DEPRECATED=1 -o
lookup_ldap.so \
		lookup_ldap.c dclist.o  \
		../lib/autofs.a -lldap -llber -lresolv
lookup_ldap.c: In function ‘do_connect’:
lookup_ldap.c:598:10: error: ‘struct lookup_context’ has no member named ‘extern_cert’
lookup_ldap.c:598:31: error: ‘struct lookup_context’ has no member named ‘extern_key’
lookup_ldap.c:599:41: error: ‘struct lookup_context’ has no member named ‘extern_cert’
lookup_ldap.c:600:40: error: ‘struct lookup_context’ has no member named ‘extern_key’
lookup_ldap.c: In function ‘free_context’:
lookup_ldap.c:1379:10: error: ‘struct lookup_context’ has no member named ‘extern_cert’
lookup_ldap.c:1380:12: error: ‘struct lookup_context’ has no member named ‘extern_cert’
lookup_ldap.c:1381:10: error: ‘struct lookup_context’ has no member named ‘extern_key’
lookup_ldap.c:1382:12: error: ‘struct lookup_context’ has no member named ‘extern_key’
make[1]: *** [lookup_ldap.so] Error 1
make[1]: *** Waiting for unfinished jobs....
make[1]: Leaving directory `/var/tmp/portage/net-fs/autofs-5.0.5-r2/work/autofs-5.0.5/modules'
make: *** [daemon] Error 2

Signed-off-by: Lan Yixun (dlan) <dennis.yxun@xxxxxxxxx>
---
 modules/lookup_ldap.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index fad558d..ddfb060 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -588,10 +588,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) {
@@ -1393,10 +1395,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;
-- 
1.8.2.1

--
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




[Index of Archives]     [Linux Filesystem Development]     [Linux Ext4]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux