Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for PR 5507 and 6686, using mostly patch by Rick Byers.

This commit is contained in:
mjl 1999-02-08 22:21:44 +00:00
parent e8690f9bd1
commit eb4489ce10
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.bin/chpass/chpass.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: chpass.c,v 1.17 1998/12/19 02:23:46 thorpej Exp $ */
/* $NetBSD: chpass.c,v 1.18 1999/02/08 22:21:44 mjl Exp $ */
/*-
* Copyright (c) 1988, 1993, 1994
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\n\
#if 0
static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94";
#else
__RCSID("$NetBSD: chpass.c,v 1.17 1998/12/19 02:23:46 thorpej Exp $");
__RCSID("$NetBSD: chpass.c,v 1.18 1999/02/08 22:21:44 mjl Exp $");
#endif
#endif /* not lint */
@ -207,6 +207,10 @@ main(argc, argv)
if (pw == NULL)
errx(1, "unknown user: uid %u\n", uid);
}
/* Make a copy for later verification */
old_pw = *pw;
old_pw.pw_gecos = strdup(old_pw.pw_gecos);
}
if (op == NEWSH) {
@ -225,10 +229,6 @@ main(argc, argv)
exit(1);
}
/* Make a copy for later verification */
old_pw = *pw;
old_pw.pw_gecos = strdup(old_pw.pw_gecos);
/* Edit the user passwd information if requested. */
if (op == EDITENTRY) {
dfd = mkstemp(tempname);
@ -276,7 +276,7 @@ main(argc, argv)
pw_error(_PATH_MASTERPASSWD, 1, 1);
/* Copy the passwd file to the lock file, updating pw. */
pw_copy(pfd, tfd, pw, &old_pw);
pw_copy(pfd, tfd, pw, (op == LOADENTRY) ? NULL : &old_pw);
/* Now finish the passwd file update. */
if (pw_mkdb() < 0)