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

Move setting of username to the correcft place; also initialize it.

Browse Source 
Reviewed by:	peter@freebsd.org
This commit is contained in:
Guido van Rooij 1996-07-14 16:42:33 +00:00
parent fb547ee202
commit 72383443f2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ static char copyright[] =
#ifndef lint
static char sccsid[] = "From: @(#)chpass.c 8.4 (Berkeley) 4/2/94";
static char rcsid[] =
"$Id: chpass.c,v 1.8 1996/05/25 01:05:17 wpaul Exp $";
"$Id: chpass.c,v 1.9 1996/07/01 19:38:07 guido Exp $";
#endif /* not lint */
#include <sys/param.h>
@ -84,7 +84,7 @@ main(argc, argv)
{
enum { NEWSH, LOADENTRY, EDITENTRY, NEWPW } op;
struct passwd *pw, lpw;
char *username;
char *username = NULL;
int ch, pfd, tfd;
char *arg;
#ifdef YP
@ -181,7 +181,6 @@ main(argc, argv)
default:
usage();
}
username = pw->pw_name;
if (op == NEWSH) {
/* protect p_shell -- it thinks NULL is /bin/sh */
if (!arg[0])
@ -197,6 +196,7 @@ main(argc, argv)
if (!pw_scan(arg, pw))
exit(1);
}
username = pw->pw_name;
if (op == NEWPW) {
if (uid)