From owner-p4-projects@FreeBSD.ORG  Tue Aug 15 17:30:02 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C683C16A5BF; Tue, 15 Aug 2006 17:30:02 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A1C3016A5BD
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 17:30:02 +0000 (UTC)
	(envelope-from bushman@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 91E0F43D6B
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 17:29:58 +0000 (GMT)
	(envelope-from bushman@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHTwZ8034019
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 17:29:58 GMT
	(envelope-from bushman@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHTwqp034016
	for perforce@freebsd.org; Tue, 15 Aug 2006 17:29:58 GMT
	(envelope-from bushman@freebsd.org)
Date: Tue, 15 Aug 2006 17:29:58 GMT
Message-Id: <200608151729.k7FHTwqp034016@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bushman@freebsd.org using -f
From: Michael Bushkov <bushman@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 104063 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Aug 2006 17:30:03 -0000

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? */