Date: Fri, 3 Nov 2006 12:30:10 GMT From: Michael Bushkov <bushman@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 109123 for review Message-ID: <200611031230.kA3CUA0e063777@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=109123 Change 109123 by bushman@bushman_nss_ldap_cached on 2006/11/03 12:30:03 Errors revealed during buildworld fixed. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libutil/Makefile#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/chpass/Makefile#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/chpass/chpass.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/chpass/edit.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pwd_mkdb/Makefile#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pwd_mkdb/pwd_mkdb.c#2 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libutil/Makefile#4 (text+ko) ==== @@ -22,8 +22,8 @@ .endif # Needed to use __pw_scan function, which is in libnssutil -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../libnssutil -LD_ADD+= -lnssutil +CFLAGS+= -I${.CURDIR}/../libnssutil +LDADD+= -lnssutil LDFLAGS+= -L${.OBJDIR}/../libnssutil MAN+= kld.3 login.3 login_auth.3 login_tty.3 logout.3 logwtmp.3 pty.3 \ ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/chpass/Makefile#3 (text+ko) ==== @@ -3,10 +3,10 @@ .include <bsd.own.mk> -.PATH: ${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../lib/libc/gen +.PATH: ${.CURDIR}/../../usr.sbin/pwd_mkdb PROG= chpass -SRCS= chpass.c edit.c field.c pw_scan.c table.c util.c +SRCS= chpass.c edit.c field.c table.c util.c BINOWN= root BINMODE=4555 WARNS?= 5 @@ -18,9 +18,9 @@ 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 +CFLAGS+= -I${.CURDIR}/../../lib/libnssutil +LDADD+= -lnssutil +LDFLAGS+= -L${.OBJDIR}/../../lib/libnssutil DPADD= ${LIBCRYPT} ${LIBUTIL} LDADD= -lcrypt -lutil ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/chpass/chpass.c#2 (text+ko) ==== @@ -65,6 +65,7 @@ #include <ypclnt.h> #endif +#include <nsswitch.h> #include <pw_scan.h> #include <libutil.h> ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/chpass/edit.c#2 (text+ko) ==== @@ -60,6 +60,7 @@ #include <string.h> #include <unistd.h> +#include <nsswitch.h> #include <pw_scan.h> #include <libutil.h> ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pwd_mkdb/Makefile#3 (text+ko) ==== @@ -5,12 +5,12 @@ PROG= pwd_mkdb MAN= pwd_mkdb.8 -SRCS= pw_scan.c pwd_mkdb.c +SRCS= pwd_mkdb.c WARNS?= 4 # Needed to use __pw_scan function, which is in libnssutil -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../libnssutil -LD_ADD+= -lnssutil -LDFLAGS+= -L${.OBJDIR}/../../libnssutil +CFLAGS+= -I${.CURDIR}/../../lib/libnssutil +LDADD+= -lnssutil +LDFLAGS+= -L${.OBJDIR}/../../lib/libnssutil .include <bsd.prog.mk> ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pwd_mkdb/pwd_mkdb.c#2 (text+ko) ==== @@ -52,6 +52,7 @@ #include <errno.h> #include <fcntl.h> #include <limits.h> +#include <nsswitch.h> #include <pwd.h> #include <signal.h> #include <stdio.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611031230.kA3CUA0e063777>