d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix world breakage introduced by my recent modifications to

Browse Source 
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>
This commit is contained in:
Crist J. Clark 2002-03-18 12:55:28 +00:00
parent 907fb800fd
commit 51906f452e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=92579
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libpam/modules/pam_unix/Makefile
View File

@ -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

2
lib/libpam/modules/pam_unix/pam_unix.c
View File

@ -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);

2
usr.bin/passwd/Makefile
View File

@ -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

2
usr.bin/passwd/local_passwd.c
View File

@ -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);