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 | |
| parent | 907fb800fd65604f07eb44cb0133085c81afdefe (diff) | |
Notes
| -rw-r--r-- | lib/libpam/modules/pam_unix/Makefile | 3 | ||||
| -rw-r--r-- | lib/libpam/modules/pam_unix/pam_unix.c | 2 | ||||
| -rw-r--r-- | usr.bin/passwd/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/passwd/local_passwd.c | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile index 1c90f0682716..d4a14c9f4016 100644 --- a/lib/libpam/modules/pam_unix/Makefile +++ b/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 diff --git a/lib/libpam/modules/pam_unix/pam_unix.c b/lib/libpam/modules/pam_unix/pam_unix.c index 14fcc273f976..7b49ec4fe1b3 100644 --- a/lib/libpam/modules/pam_unix/pam_unix.c +++ b/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); 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); |
