diff options
| author |   Guido van Rooij <guido@FreeBSD.org> | 1996-07-14 16:42:33 +0000 |
|---|---|---|
| committer | Guido van Rooij <guido@FreeBSD.org> | 1996-07-14 16:42:33 +0000 |
| commit | db3019bee11d27de92f652ab0a832ed72f97a4c6 (patch) | |
| tree | 6ccfeaba409007fa8b523ce99394bc6194ef7413 /chpass/chpass.c | |
| parent | b07f424116833ad94061c5610646ae2c6ef00265 (diff) | |
| download | pw-darwin-db3019bee11d27de92f652ab0a832ed72f97a4c6.tar.gz pw-darwin-db3019bee11d27de92f652ab0a832ed72f97a4c6.tar.zst pw-darwin-db3019bee11d27de92f652ab0a832ed72f97a4c6.zip | |
Move setting of username to the correcft place; also initialize it.
Reviewed by: peter@freebsd.org
Diffstat (limited to 'chpass/chpass.c')
| -rw-r--r-- | chpass/chpass.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chpass/chpass.c b/chpass/chpass.c index 83d5498..9a7b8a6 100644 --- a/chpass/chpass.c +++ b/chpass/chpass.c @@ -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) |