diff options
| author | Crist J. Clark <cjc@FreeBSD.org> | 2002-03-18 12:55:28 +0000 |
|---|---|---|
| committer | Crist J. Clark <cjc@FreeBSD.org> | 2002-03-18 12:55:28 +0000 |
| commit | 51906f452e1802369cd27bf27222f2abbc0e45ad (patch) | |
| tree | 79b6de113d75bc71aa000c5399140bfc75e18839 /usr.bin/passwd | |
| parent | 907fb800fd65604f07eb44cb0133085c81afdefe (diff) | |
| download | src-51906f452e1802369cd27bf27222f2abbc0e45ad.tar.gz src-51906f452e1802369cd27bf27222f2abbc0e45ad.zip | |
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>
Notes
Notes:
svn path=/head/; revision=92579
Diffstat (limited to 'usr.bin/passwd')
| -rw-r--r-- | usr.bin/passwd/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/passwd/local_passwd.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index 67022c3b51c6..119290444bfb 100644 --- a/usr.bin/passwd/Makefile +++ b/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 diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c index ce2e46beceea..91b8bf76bc40 100644 --- a/usr.bin/passwd/local_passwd.c +++ b/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); |