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

Move the YP initialization earlier, so it's done before the evaluation

Browse Source 
of -p/-s/-a related cruft.

Closes PR # misc/933 "chpass -s <shell>" does not work
This commit is contained in:
Joerg Wunsch 1996-01-06 15:03:02 +00:00
parent 5f7351637a
commit 049ceb634f
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
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.4 1995/08/13 16:12:24 wpaul Exp $";
"$Id: chpass.c,v 1.5 1995/09/02 03:56:17 wpaul Exp $";
#endif /* not lint */
#include <sys/param.h>
@ -141,31 +141,6 @@ main(argc, argv)
default:
usage();
}
if (op == NEWSH) {
/* protect p_shell -- it thinks NULL is /bin/sh */
if (!arg[0])
usage();
if (p_shell(arg, pw, (ENTRY *)NULL))
pw_error((char *)NULL, 0, 1);
}
if (op == LOADENTRY) {
if (uid)
baduser();
pw = &lpw;
if (!pw_scan(arg, pw))
exit(1);
}
if (op == NEWPW) {
if (uid)
baduser();
if(strchr(arg, ':')) {
errx(1, "invalid format for password");
}
pw->pw_passwd = arg;
}
#ifdef YP
pw->pw_name = strdup(pw->pw_name);
@ -193,6 +168,32 @@ main(argc, argv)
}
#endif /* YP */
if (op == NEWSH) {
/* protect p_shell -- it thinks NULL is /bin/sh */
if (!arg[0])
usage();
if (p_shell(arg, pw, (ENTRY *)NULL))
pw_error((char *)NULL, 0, 1);
}
if (op == LOADENTRY) {
if (uid)
baduser();
pw = &lpw;
if (!pw_scan(arg, pw))
exit(1);
}
if (op == NEWPW) {
if (uid)
baduser();
if(strchr(arg, ':')) {
errx(1, "invalid format for password");
}
pw->pw_passwd = arg;
}
/*
* The temporary file/file descriptor usage is a little tricky here.
* 1: We start off with two fd's, one for the master password