Date: Tue, 15 Aug 2006 17:29:58 GMT From: Michael Bushkov <bushman@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 104063 for review Message-ID: <200608151729.k7FHTwqp034016@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=104063 Change 104063 by bushman@bushman_nss_ldap_cached on 2006/08/15 17:29:28 nss_ldap's Makefile updated to properly support compilation options. Manual page was shamefully taken from PADL's nss_ldap. Would be rewritten ASAP. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/Makefile#11 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.h#11 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.5#1 add Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/Makefile#11 (text+ko) ==== @@ -9,14 +9,19 @@ SRCS= nss_ldap.c ldap_group.c ldap_passwd.c ldap_serv.c ldapconn.c\ ldapconf.c ldapschema.c ldapsearch.c ldaptls.c ldaputil.c -CFLAGS+=-I${.CURDIR}/../libnssutil -I/usr/local/include + CFLAGS+=-DINET6 -CFLAGS+=-g +LDADD+= -lldap + +.if ${MK_OPENSSL} != "no" +CFLAGS+= -DNSS_LDAP_START_TLS_ENABLED -DNSS_LDAP_SSL_ENABLED +.endif -LDADD+= -lnssutil -lldap -lsasl2 -LDFLAGS+= -L${.OBJDIR}/../libnssutil -L/usr/local/lib +CFLAGS+= ${OPENLDAP_CFLAGS} +LDFLAGS+= ${OPENLDAP_LDFLAGS} +LDADD+= ${OPENLDAP_LDADD} -INCS= -MAN= +INCS= +MAN= nss_ldap.5 .include <bsd.lib.mk> ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.h#11 (text+ko) ==== @@ -30,10 +30,10 @@ #define _LDAPCONN_H_ /* TODO: remove in release */ -#define NSS_LDAP_START_TLS_ENABLED -#define NSS_LDAP_SSL_ENABLED #define NSS_LDAP_SIMPLE_AUTH_ENABLED +#ifdef SASL #define NSS_LDAP_SASL_AUTH_ENABLED +#endif #define NSS_LDAP_MAX_ERR_DESC_SIZE 256 /* TODO: is this correct? */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608151729.k7FHTwqp034016>