diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-07-11 20:15:41 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-07-11 20:15:41 +0000 |
| commit | 2af412c9779e5aa74fe06676c681f1231ea9178b (patch) | |
| tree | d31293b47fadf41188b00905bf5b2869f8a18167 /usr.sbin/cron/user.c | |
| parent | 71368518123d95dcba8f0ba5a22e9650a9c64a66 (diff) | |
More syncing with my cron 4.0 patch tree, basically cosmetic:
o change an instance of e_none to e_memory that I missed (forgot?)
o kill some whitespace
o modify malloc failure recovery a bit
Diffstat (limited to 'usr.sbin/cron/user.c')
| -rw-r--r-- | usr.sbin/cron/user.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/cron/user.c b/usr.sbin/cron/user.c index 12f7e375cd0..de60ed83eb6 100644 --- a/usr.sbin/cron/user.c +++ b/usr.sbin/cron/user.c @@ -1,4 +1,4 @@ -/* $OpenBSD: user.c,v 1.4 2002/07/08 18:11:02 millert Exp $ */ +/* $OpenBSD: user.c,v 1.5 2002/07/11 20:15:40 millert Exp $ */ /* Copyright 1988,1990,1993,1994 by Paul Vixie * All rights reserved */ @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(LINT) -static const char rcsid[] = "$OpenBSD: user.c,v 1.4 2002/07/08 18:11:02 millert Exp $"; +static const char rcsid[] = "$OpenBSD: user.c,v 1.5 2002/07/11 20:15:40 millert Exp $"; #endif /* vix 26jan87 [log is in RCS file] @@ -95,15 +95,14 @@ load_user(int crontab_fd, struct passwd *pw, const char *name) { } break; case TRUE: - if ((tenvp = env_set(envp, envstr))) { - envp = tenvp; - } else { + if ((tenvp = env_set(envp, envstr)) == NULL) { save_errno = errno; free_user(u); u = NULL; errno = save_errno; goto done; } + envp = tenvp; break; } } |