diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2001-08-16 18:29:28 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2001-08-16 18:29:28 +0000 |
| commit | 1dd31862c4767860d39180b4b4f8a33012ab22ad (patch) | |
| tree | 8bb31270c3922ab72b781b71df2a59718f2e3016 | |
| parent | dd5753f8fb6df4bed736a5e28149872f1e22b232 (diff) | |
extra arg to pw_mkdb
| -rw-r--r-- | usr.bin/chpass/chpass.c | 6 | ||||
| -rw-r--r-- | usr.bin/passwd/local_passwd.c | 8 | ||||
| -rw-r--r-- | usr.sbin/user/user.c | 8 | ||||
| -rw-r--r-- | usr.sbin/vipw/vipw.c | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c index 89b9aa69a9e..bdb3a1b3cb7 100644 --- a/usr.bin/chpass/chpass.c +++ b/usr.bin/chpass/chpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chpass.c,v 1.18 2001/08/16 16:14:35 millert Exp $ */ +/* $OpenBSD: chpass.c,v 1.19 2001/08/16 18:29:27 millert Exp $ */ /* $NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: chpass.c,v 1.18 2001/08/16 16:14:35 millert Exp $"; +static char rcsid[] = "$OpenBSD: chpass.c,v 1.19 2001/08/16 18:29:27 millert Exp $"; #endif #endif /* not lint */ @@ -257,7 +257,7 @@ main(argc, argv) pw_copy(pfd, tfd, pw); /* Now finish the passwd file update. */ - if (pw_mkdb(pw->pw_name) == -1) + if (pw_mkdb(pw->pw_name, 0) == -1) pw_error(NULL, 0, 1); } diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c index 4a688506053..2943a7815ea 100644 --- a/usr.bin/passwd/local_passwd.c +++ b/usr.bin/passwd/local_passwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: local_passwd.c,v 1.17 2001/08/16 16:14:35 millert Exp $ */ +/* $OpenBSD: local_passwd.c,v 1.18 2001/08/16 18:29:27 millert Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -35,7 +35,7 @@ #ifndef lint /*static const char sccsid[] = "from: @(#)local_passwd.c 5.5 (Berkeley) 5/6/91";*/ -static const char rcsid[] = "$OpenBSD: local_passwd.c,v 1.17 2001/08/16 16:14:35 millert Exp $"; +static const char rcsid[] = "$OpenBSD: local_passwd.c,v 1.18 2001/08/16 18:29:27 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -150,9 +150,9 @@ local_passwd(uname, authenticated) if (pfd < 0 || fcntl(pfd, F_SETFD, 1) == -1) pw_error(_PATH_MASTERPASSWD, 1, 1); - /* Update master.passwd file and build .db version. */ + /* Update master.passwd file and rebuild spwd.db. */ pw_copy(pfd, tfd, pw); - if (pw_mkdb(uname) < 0) + if (pw_mkdb(uname, 1) < 0) pw_error((char *)NULL, 0, 1); return(0); diff --git a/usr.sbin/user/user.c b/usr.sbin/user/user.c index d91b53ac03c..7de56665dd7 100644 --- a/usr.sbin/user/user.c +++ b/usr.sbin/user/user.c @@ -1,4 +1,4 @@ -/* $OpenBSD: user.c,v 1.23 2001/03/24 19:27:18 jakob Exp $ */ +/* $OpenBSD: user.c,v 1.24 2001/08/16 18:29:27 millert Exp $ */ /* $NetBSD: user.c,v 1.17 2000/04/14 06:26:55 simonb Exp $ */ /* @@ -854,7 +854,7 @@ adduser(char *login, user_t *up) "failed to modify secondary groups for login %s", login); } (void) close(ptmpfd); - if (pw_mkdb(login) < 0) { + if (pw_mkdb(login, 0) < 0) { err(EXIT_FAILURE, "pw_mkdb failed"); } return 1; @@ -1025,9 +1025,9 @@ moduser(char *login, char *newlogin, user_t *up) } (void) close(ptmpfd); if (up != (user_t *) NULL && strcmp(login, newlogin) == 0) - cc = pw_mkdb(login); + cc = pw_mkdb(login, 0); else - cc = pw_mkdb(NULL); + cc = pw_mkdb(NULL, 0); if (cc < 0) { err(EXIT_FAILURE, "pw_mkdb failed"); } diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c index aa7c27ab39f..6a2d07b228a 100644 --- a/usr.sbin/vipw/vipw.c +++ b/usr.sbin/vipw/vipw.c @@ -101,7 +101,7 @@ main(argc, argv) warnx("no changes made"); pw_error((char *)NULL, 0, 0); } - if (pw_mkdb(NULL) == 0) + if (pw_mkdb(NULL, 0) == 0) break; pw_prompt(); } |