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

Tone down the paranoia a bit in from the previous commit. setusercontext()

Browse Source 
automatically Does The Right Thing when lc == NULL, which just happens to
be what the extra code in cron was trying to do.  Simplify.
This commit is contained in:
Peter Wemm 1997-03-14 14:45:30 +00:00
parent 39da5de262
commit 9efe2eccdd
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.sbin/cron/cron/do_command.c
View File

@ -16,7 +16,7 @@
*/
#if !defined(lint) && !defined(LINT)
static char rcsid[] = "$Id: do_command.c,v 1.10 1997/02/22 16:04:43 peter Exp $";
static char rcsid[] = "$Id: do_command.c,v 1.11 1997/03/14 13:48:04 peter Exp $";
#endif
@ -82,7 +82,6 @@ child_process(e, u)
int children = 0;
# if defined(LOGIN_CAP)
struct passwd *pwd;
login_cap_t *lc;
# endif
Debug(DPROC, ("[%d] child_process('%s')\n", getpid(), e->cmd))
@ -224,16 +223,13 @@ child_process(e, u)
* as cron provides a separate interface for this
*/
pwd = getpwuid(e->uid);
if (pwd)
lc = login_getclass(pwd);
else
lc = NULL;
if (lc && pwd) {
setusercontext(lc, pwd, e->uid,
LOGIN_SETALL & ~(LOGIN_SETPATH|LOGIN_SETENV));
login_close(lc);
} else {
if (pwd &&
setusercontext(NULL, pwd, e->uid,
LOGIN_SETALL & ~(LOGIN_SETPATH|LOGIN_SETENV)) == 0)
(void) endpwent();
else {
/* fall back to the old method */
(void) endpwent();
# endif
/* set our directory, uid and gid. Set gid first,
* since once we set uid, we've lost root privledges.