From owner-p4-projects@FreeBSD.ORG  Thu Nov  2 14:12:18 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 0F6CC16A40F; Thu,  2 Nov 2006 14:12:18 +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 C5F3D16A403
	for <perforce@freebsd.org>; Thu,  2 Nov 2006 14:12:17 +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 8B57A43D5D
	for <perforce@freebsd.org>; Thu,  2 Nov 2006 14:12:17 +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 kA2ECHj1071202
	for <perforce@freebsd.org>; Thu, 2 Nov 2006 14:12:17 GMT
	(envelope-from bushman@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA2ECHff071197
	for perforce@freebsd.org; Thu, 2 Nov 2006 14:12:17 GMT
	(envelope-from bushman@freebsd.org)
Date: Thu, 2 Nov 2006 14:12:17 GMT
Message-Id: <200611021412.kA2ECHff071197@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 109040 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: Thu, 02 Nov 2006 14:12:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=109040

Change 109040 by bushman@bushman_nss_ldap_cached on 2006/11/02 14:11:34

	__pw_scan should be takend only from libnssutil

Affected files ...

.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/chpass/Makefile#2 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pwd_mkdb/Makefile#2 edit

Differences ...

==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/chpass/Makefile#2 (text+ko) ====

@@ -15,7 +15,12 @@
 .endif
 #Some people need this, uncomment to activate
 #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
-CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I.
+CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I.
+
+# Needed to use __pw_scan function, which is in libnssutil
+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../libnssutil
+LD_ADD+= -lnssutil
+LDFLAGS+= -L${.OBJDIR}/../../libnssutil
 
 DPADD=	${LIBCRYPT} ${LIBUTIL}
 LDADD=	-lcrypt -lutil

==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pwd_mkdb/Makefile#2 (text+ko) ====

@@ -8,6 +8,9 @@
 SRCS=	pw_scan.c pwd_mkdb.c
 
 WARNS?=	4
-CFLAGS+= -I${.CURDIR}/../../lib/libc/gen		# for pw_scan.h
+# Needed to use __pw_scan function, which is in libnssutil
+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../libnssutil
+LD_ADD+= -lnssutil
+LDFLAGS+= -L${.OBJDIR}/../../libnssutil
 
 .include <bsd.prog.mk>