Fix world breakage introduced by my recent modifications to

chpass(8). The relations between libc, libpam, chpass, passwd, and
vipw are a mess and probably should be cleaned up.

Submitted by:	Peter Pentchev <roam@ringlet.net>

lib/libpam/modules/pam_unix/Makefile

@@ -31,7 +31,8 @@ CFLAGS+=	-DYP -Dyp_error=warnx \
 		-I${.OBJDIR} \
 		-I${.CURDIR}/../../../../libexec/ypxfr \
 		-I${.CURDIR}/../../../../usr.sbin/vipw \
-		-I${.CURDIR}/../../../../usr.bin/chpass
+		-I${.CURDIR}/../../../../usr.bin/chpass \
+		-I${.CURDIR}/../../../../lib/libc/gen
 DPADD=		${LIBUTIL} ${LIBCRYPT} ${LIBRPCSVC}
 LDADD=		-lutil -lcrypt -lrpcsvc
 MAN=		pam_unix.8

lib/libpam/modules/pam_unix/pam_unix.c

@@ -578,7 +578,7 @@ local_passwd(const char *user, const char *pass)
 
 	pfd = pw_lock();
 	tfd = pw_tmp();
-	pw_copy(pfd, tfd, pwd);
+	pw_copy(pfd, tfd, pwd, NULL);
 
 	if (!pw_mkdb(user))
 		pw_error((char *)NULL, 0, 1);

usr.bin/passwd/Makefile

@@ -20,6 +20,7 @@ LDADD=	-lcrypt -lutil
 CFLAGS+= -DLOGIN_CAP -DCRYPT -I. -I${.CURDIR} \
 	-I${.CURDIR}/../../usr.sbin/vipw \
 	-I${.CURDIR}/../../usr.bin/chpass \
+	-I${.CURDIR}/../../lib/libc/gen \
 	-Dyp_error=warnx -DLOGGING
 
 .else
@@ -42,6 +43,7 @@ CFLAGS+= -DLOGIN_CAP -DCRYPT -DYP -I. -I${.CURDIR} \
 	-I${.CURDIR}/../../usr.bin/chpass \
 	-I${.CURDIR}/../../libexec/ypxfr \
 	-I${.CURDIR}/../../usr.sbin/rpc.yppasswdd \
+	-I${.CURDIR}/../../lib/libc/gen \
 	-Dyp_error=warnx -DLOGGING
 
 .endif

usr.bin/passwd/local_passwd.c

@@ -223,7 +223,7 @@ local_passwd(uname)
 
 	pfd = pw_lock();
 	tfd = pw_tmp();
-	pw_copy(pfd, tfd, pw);
+	pw_copy(pfd, tfd, pw, NULL);
 
 	if (!pw_mkdb(uname))
 		pw_error((char *)NULL, 0, 1);