Deleted Added
full compact
entry.c (167328) entry.c (170890)
1/* Copyright 1988,1990,1993,1994 by Paul Vixie
2 * All rights reserved
3 *
4 * Distribute freely, except: don't remove my name from the source or
5 * documentation (don't take credit for my work), mark your changes (don't
6 * get me blamed for your possible bugs), don't alter or remove this
7 * notice. May be sold if buildable source is provided to buyer. No
8 * warrantee of any kind, express or implied, is included with this
9 * software; use at your own risk, responsibility for damages (if any) to
10 * anyone resulting from the use of this software rests entirely with the
11 * user.
12 *
13 * Send bug reports, bug fixes, enhancements, requests, flames, etc., and
14 * I'll try to keep a version up to date. I can be reached as follows:
15 * Paul Vixie <paul@vix.com> uunet!decwrl!vixie!paul
16 */
17
18#if !defined(lint) && !defined(LINT)
19static const char rcsid[] =
1/* Copyright 1988,1990,1993,1994 by Paul Vixie
2 * All rights reserved
3 *
4 * Distribute freely, except: don't remove my name from the source or
5 * documentation (don't take credit for my work), mark your changes (don't
6 * get me blamed for your possible bugs), don't alter or remove this
7 * notice. May be sold if buildable source is provided to buyer. No
8 * warrantee of any kind, express or implied, is included with this
9 * software; use at your own risk, responsibility for damages (if any) to
10 * anyone resulting from the use of this software rests entirely with the
11 * user.
12 *
13 * Send bug reports, bug fixes, enhancements, requests, flames, etc., and
14 * I'll try to keep a version up to date. I can be reached as follows:
15 * Paul Vixie <paul@vix.com> uunet!decwrl!vixie!paul
16 */
17
18#if !defined(lint) && !defined(LINT)
19static const char rcsid[] =
20 "$FreeBSD: head/usr.sbin/cron/lib/entry.c 167328 2007-03-08 07:00:42Z will $";
20 "$FreeBSD: head/usr.sbin/cron/lib/entry.c 170890 2007-06-17 17:25:53Z yar $";
21#endif
22
23/* vix 26jan87 [RCS'd; rest of log is in RCS file]
24 * vix 01jan87 [added line-level error recovery]
25 * vix 31dec86 [added /step to the from-to range, per bob@acornrc]
26 * vix 30dec86 [written]
27 */
28

--- 289 unchanged lines hidden (view full) ---

318 if (grp != NULL)
319 pw->pw_gid = grp->gr_gid;
320 Debug(DPARS, ("load_entry()...uid %d, gid %d\n",pw->pw_uid,pw->pw_gid))
321#ifdef LOGIN_CAP
322 Debug(DPARS, ("load_entry()...class %s\n",e->class))
323#endif
324 }
325
21#endif
22
23/* vix 26jan87 [RCS'd; rest of log is in RCS file]
24 * vix 01jan87 [added line-level error recovery]
25 * vix 31dec86 [added /step to the from-to range, per bob@acornrc]
26 * vix 30dec86 [written]
27 */
28

--- 289 unchanged lines hidden (view full) ---

318 if (grp != NULL)
319 pw->pw_gid = grp->gr_gid;
320 Debug(DPARS, ("load_entry()...uid %d, gid %d\n",pw->pw_uid,pw->pw_gid))
321#ifdef LOGIN_CAP
322 Debug(DPARS, ("load_entry()...class %s\n",e->class))
323#endif
324 }
325
326#ifndef PAM /* PAM takes care of account expiration by itself */
326 if (pw->pw_expire && time(NULL) >= pw->pw_expire) {
327 ecode = e_username;
328 goto eof;
329 }
327 if (pw->pw_expire && time(NULL) >= pw->pw_expire) {
328 ecode = e_username;
329 goto eof;
330 }
331#endif /* !PAM */
330
331 e->uid = pw->pw_uid;
332 e->gid = pw->pw_gid;
333
334 /* copy and fix up environment. some variables are just defaults and
335 * others are overrides.
336 */
337 e->envp = env_copy(envp);

--- 305 unchanged lines hidden ---
332
333 e->uid = pw->pw_uid;
334 e->gid = pw->pw_gid;
335
336 /* copy and fix up environment. some variables are just defaults and
337 * others are overrides.
338 */
339 e->envp = env_copy(envp);

--- 305 unchanged lines hidden ---