 @@ -1,41 +1,41 @@
-/*	$NetBSD: crontab.c,v 1.3 2010/05/18 21:47:43 christos Exp $	*/
+/*	$NetBSD: crontab.c,v 1.3.8.1 2012/03/07 23:41:17 riz Exp $	*/
 /* Copyright 1988,1990,1993,1994 by Paul Vixie
  * All rights reserved
  */
 /*
  * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1997,2000 by Internet Software Consortium, Inc.
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
 #if !defined(lint) && !defined(LINT)
 #if 0
 static char rcsid[] = "Id: crontab.c,v 1.12 2004/01/23 18:56:42 vixie Exp";
 #else
-__RCSID("$NetBSD: crontab.c,v 1.3 2010/05/18 21:47:43 christos Exp $");
+__RCSID("$NetBSD: crontab.c,v 1.3.8.1 2012/03/07 23:41:17 riz Exp $");
 #endif
 #endif
 /* crontab - install and manage per-user crontab files
  * vix 02may87 [RCS has the rest of the log]
  * vix 26jan87 [original]
  */
 #define	MAIN_PROGRAM
 #include "cron.h"
 #define NHEADER_LINES 3
 @@ -56,48 +56,60 @@ static	char		Filename[MAX_FNAME], TempFi
 static	FILE		*NewCrontab;
 static	int		CheckErrorCount;
 static	enum opt_t	Option;
 static	struct passwd	*pw;
 static	void		list_cmd(void),
 			delete_cmd(void),
 			edit_cmd(void),
 			poke_daemon(void),
 			check_error(const char *),
 			parse_args(int c, char *v[]);
 static	int		replace_cmd(void);
 static  int		allowed(const char *, const char *, const char *);
 static  int		in_file(const char *, FILE *, int);
-static  int 		swap_uids(void);
+static  int 		relinguish_priv(void);
 static  int 		regain_priv(void);
 static void
 usage(const char *msg) {
 	(void)fprintf(stderr, "%s: usage error: %s\n", getprogname(), msg);
 	(void)fprintf(stderr, "usage:\t%s [-u user] file\n", getprogname());
 	(void)fprintf(stderr, "\t%s [-u user] [ -e | -l | -r ]\n", getprogname());
 	(void)fprintf(stderr, "\t\t(default operation is replace, per 1003.2)\n");
 	(void)fprintf(stderr, "\t-e\t(edit user's crontab)\n");
 	(void)fprintf(stderr, "\t-l\t(list user's crontab)\n");
 	(void)fprintf(stderr, "\t-r\t(delete user's crontab)\n");
 	exit(ERROR_EXIT);
+}
 static uid_t euid, ruid;
 static gid_t egid, rgid;
 int
 main(int argc, char *argv[]) {
 	int exitstatus;
 	setprogname(argv[0]);
 	Pid = getpid();
 	(void)setlocale(LC_ALL, "");
 	euid = geteuid();
 	egid = getegid();
 	ruid = getuid();
 	rgid = getgid();
 	if (euid == ruid && ruid != 0)
 		errx(ERROR_EXIT, "Not installed setuid root");
 	(void)setvbuf(stderr, NULL, _IOLBF, 0);
 	parse_args(argc, argv);		/* sets many globals, opens a file */
 	set_cron_cwd();
 	if (!allowed(RealUser, CRON_ALLOW, CRON_DENY)) {
 		(void)fprintf(stderr,
 			"You `%s' are not allowed to use this program `%s'\n",
 			User, getprogname());
 		(void)fprintf(stderr, "See crontab(1) for more information\n");
 		log_it(RealUser, Pid, "AUTH", "crontab command not allowed");
 		exit(ERROR_EXIT);
+	}
 	exitstatus = OK_EXIT;
 	switch (Option) {
 @@ -201,33 +213,33 @@ parse_args(int argc, char *argv[]) {
 		 * reading the file.
 		 */
 		if (!strcmp(Filename, "-"))
 			NewCrontab = stdin;
 		else {
 			/* relinquish the setuid status of the binary during
 			 * the open, lest nonroot users read files they should
 			 * not be able to read.  we can't use access() here
 			 * since there's a race condition.  thanks go out to
 			 * Arnt Gulbrandsen <agulbra@pvv.unit.no> for spotting
 			 * the race.
 			 */
-			if (swap_uids() < OK) {
+			if (relinguish_priv() < OK) {
 				err(ERROR_EXIT, "swapping uids");
+			}
 			if (!(NewCrontab = fopen(Filename, "r"))) {
 				err(ERROR_EXIT, "cannot open `%s'", Filename);
+			}
-			if (swap_uids() < OK) {
+			if (regain_priv() < OK) {
 				err(ERROR_EXIT, "swapping uids back");
+			}
+		}
+	}
 	Debug(DMISC, ("user=%s, file=%s, option=%s\n",
 		      User, Filename, Options[(int)Option]));
+}
 static void
 skip_header(int *pch, FILE *f)
+{
 	int ch;
 @@ -577,27 +589,27 @@ replace_cmd(void) {
 	if ((uintmax_t)statbuf.st_size > (uintmax_t)maxtabsize)  {
 	    warnx("%ld bytes is larger than the maximum size of %ld bytes",
 		(long) statbuf.st_size, (long) maxtabsize);
 	    error = -2;
 	    goto done;
+	}
 	/* write a signature at the top of the file.
+	 *
 	 * VERY IMPORTANT: make sure NHEADER_LINES agrees with this code.
 	 */
 	(void)fprintf(tmp, "# DO NOT EDIT THIS FILE - edit the master and reinstall.\n");
 	(void)fprintf(tmp, "# (%s installed on %-24.24s)\n", Filename, ctime(&now));
-	(void)fprintf(tmp, "# (Cron version %s -- %s)\n", CRON_VERSION, "$NetBSD: crontab.c,v 1.3 2010/05/18 21:47:43 christos Exp $");
+	(void)fprintf(tmp, "# (Cron version %s -- %s)\n", CRON_VERSION, "$NetBSD: crontab.c,v 1.3.8.1 2012/03/07 23:41:17 riz Exp $");
 	/* copy the crontab to the tmp
 	 */
 	(void)rewind(NewCrontab);
 	Set_LineNum(1);
 	lastch = EOF;
 	while (EOF != (ch = get_char(NewCrontab)))
 		(void)putc(lastch = ch, tmp);
 	if (lastch != (char)EOF && lastch != '\n') {
 		warnx("missing trailing newline in `%s'", Filename);
 		error = -1;
 		goto done;
 @@ -762,35 +774,31 @@ in_file(const char *string, FILE *file,
 				return (error);
 			*endp = '\0';
 			if (0 == strcmp(line, string))
 				return (TRUE);
+		}
+	}
 	if (ferror(file))
 		return (error);
 	return (FALSE);
+}
 #ifdef HAVE_SAVED_UIDS
-static int swap_uids(void) {
+static int relinguish_priv(void) {
-	return ((setegid(getgid()) || seteuid(getuid())) ? -1 : 0);
+	return (setegid(rgid) || seteuid(ruid)) ? -1 : 0;
+}
 #if 0
-static int swap_uids_back(void) {
+static int regain_priv(void) {
-	return ((setegid(getgid()) || seteuid(getuid())) ? -1 : 0);
+	return (setegid(egid) || seteuid(euid)) ? -1 : 0;
+}
 #endif
 #else /*HAVE_SAVED_UIDS*/
-static int swap_uids(void) {
+static int relinguish_priv(void) {
-	return ((setregid(getegid(), getgid()) || setreuid(geteuid(), getuid()))
+	return (setregid(egid, rgid) || setreuid(euid, ruid)) ? -1 : 0;
 	    ? -1 : 0);
+}
-#if 0
+static int regain_priv(void) {
-static int swap_uids_back(void) {
+	return (setregid(rgid, egid) || setreuid(ruid, euid)) ? -1 : 0;
 	return (swap_uids());
+}
 #endif
 #endif /*HAVE_SAVED_UIDS*/