 @@ -1,14 +1,14 @@
-/*	$NetBSD: calendar.c,v 1.50 2013/11/09 15:57:15 christos Exp $	*/
+/*	$NetBSD: calendar.c,v 1.50.4.1 2015/07/01 07:26:42 bouyer Exp $	*/
 /*
  * Copyright (c) 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,35 +29,36 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)calendar.c	8.4 (Berkeley) 1/7/95";
 #endif
-__RCSID("$NetBSD: calendar.c,v 1.50 2013/11/09 15:57:15 christos Exp $");
+__RCSID("$NetBSD: calendar.c,v 1.50.4.1 2015/07/01 07:26:42 bouyer Exp $");
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
 #include <sys/wait.h>
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <pwd.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <tzfile.h>
 #include <unistd.h>
 @@ -102,26 +103,27 @@ static struct iovec header[] = {
 static const char *days[] = {
 	"sun", "mon", "tue", "wed", "thu", "fri", "sat", NULL,
 };
 static const char *months[] = {
 	"jan", "feb", "mar", "apr", "may", "jun",
 	"jul", "aug", "sep", "oct", "nov", "dec", NULL,
 };
 static void	 atodays(int, char *, unsigned short *);
 static void	 cal(void);
 static void	 closecal(FILE *);
 static void	 changeuser(void);
 static int	 getday(char *);
 static int	 getfield(char *, char **, int *);
 static void	 getmmdd(struct tm *, char *);
 static int	 getmonth(char *);
 static bool	 isnow(char *);
 static FILE	*opencal(FILE **);
 static void	 settime(void);
 static void	 usage(void) __dead;
 int
 main(int argc, char **argv)
+{
 	int ch;
 @@ -161,32 +163,44 @@ main(int argc, char **argv)
+	}
 	argc -= optind;
 	argv += optind;
 	if (argc)
 		usage();
 	settime();
 	if (doall) {
 		/*
 		 * XXX - This ignores the user's CALENDAR_DIR variable.
 		 *       Run under user's login shell?
 		 */
 		if (setgroups(0, NULL) == -1) {
 			err(EXIT_FAILURE, "setgroups");
+		}
 		while ((pw = getpwent()) != NULL) {
-			(void)setegid(pw->pw_gid);
+			if (setegid(pw->pw_gid) == -1) {
-			(void)seteuid(pw->pw_uid);
+				warn("%s: setegid", pw->pw_name);
-			if (chdir(pw->pw_dir) != -1)
+				continue;
+			}
 			if (seteuid(pw->pw_uid) == -1) {
 				warn("%s: seteuid", pw->pw_name);
 				continue;
+			}
 			if (chdir(pw->pw_dir) != -1) {
 				cal();
 			(void)seteuid(0);
 			if (seteuid(0) == -1) {
 				warn("%s: seteuid back to 0", pw->pw_name);
+			}
+		}
 	} else if ((caldir = getenv("CALENDAR_DIR")) != NULL) {
 		if (chdir(caldir) != -1)
 			cal();
 	} else if ((pw = getpwuid(geteuid())) != NULL) {
 		if (chdir(pw->pw_dir) != -1)
 			cal();
+	}
 	return 0;
+}
 static void
 cal(void)
 @@ -419,26 +433,30 @@ opencal(FILE **in)
 	case 0:
 		/* child */
 		/* set stdin to calendar file */
 		if (fd != STDIN_FILENO) {
 			(void)dup2(fd, STDIN_FILENO);
 			(void)close(fd);
+		}
 		/* set stdout to pipe input */
 		if (pdes[1] != STDOUT_FILENO) {
 			(void)dup2(pdes[1], STDOUT_FILENO);
 			(void)close(pdes[1]);
+		}
 		(void)close(pdes[0]);
 		if (doall) {
 			/* become the user properly */
 			changeuser();
+		}
 		/* tell CPP to only open regular files */
 		if(!cpp_restricted && setenv("CPP_RESTRICTED", "", 1) == -1)
 			err(EXIT_FAILURE, "Cannot restrict cpp");
 		cpp_restricted = true;
 		(void)execl(_PATH_CPP, "cpp", "-traditional", "-P", "-I.",
 		    "-I" _PATH_CALENDARS, NULL);
 		err(EXIT_FAILURE, "Cannot exec `%s'", _PATH_CPP);
 		/*NOTREACHED*/
 	default:
 		/* parent -- fdopen *in to pipe output */
 		*in = fdopen(pdes[0], "r");
 		(void)close(pdes[1]);
 @@ -485,49 +503,81 @@ closecal(FILE *fp)
 	switch (fork()) {
 	case -1:
 		/* error */
 		(void)close(pdes[0]);
 		(void)close(pdes[1]);
 		break;
 	case 0:
 		/* child -- set stdin to pipe output */
 		if (pdes[0] != STDIN_FILENO) {
 			(void)dup2(pdes[0], STDIN_FILENO);
 			(void)close(pdes[0]);
+		}
 		(void)close(pdes[1]);
 		if (doall) {
 			/* become the user properly */
 			changeuser();
+		}
 		(void)execl(_PATH_SENDMAIL, "sendmail", "-i", "-t", "-F",
 		    "\"Reminder Service\"", "-f", "root", NULL);
 		err(EXIT_FAILURE, "Cannot exec `%s'", _PATH_SENDMAIL);
 		/*NOTREACHED*/
 	default:
 		/* parent -- write to pipe input */
 		(void)close(pdes[0]);
 		header[1].iov_base = header[3].iov_base = (void *)pw->pw_name;
 		header[1].iov_len = header[3].iov_len = strlen(pw->pw_name);
 		(void)writev(pdes[1], header, 7);
 		while ((nread = read(fileno(fp), buf, sizeof(buf))) > 0)
 			(void)write(pdes[1], buf, (size_t)nread);
 		(void)close(pdes[1]);
 		break;
+	}
 done:	(void)fclose(fp);
 	(void)unlink(path);
 	while (wait(&status) != -1)
 		continue;
+}
 static void
 changeuser(void)
+{
 	uid_t uid;
 	gid_t gid;
 	uid = geteuid();
 	gid = getegid();
 	assert(uid == pw->pw_uid);
 	assert(gid == pw->pw_gid);
 	if (seteuid(0) == -1) {
 		err(EXIT_FAILURE, "%s: changing user: cannot reassert uid 0",
 		    pw->pw_name);
+	}
 	if (setgid(gid) == -1) {
 		err(EXIT_FAILURE, "%s: cannot assume gid %d",
 		    pw->pw_name, (int)gid);
+	}
 	if (initgroups(pw->pw_name, gid) == -1) {
 		err(EXIT_FAILURE, "%s: cannot initgroups", pw->pw_name);
+	}
 	if (setuid(uid) == -1) {
 		err(EXIT_FAILURE, "%s: cannot assume uid %d",
 		    pw->pw_name, (int)uid);
+	}
+}
 static int
 getmonth(char *s)
+{
 	const char **p;
 	for (p = months; *p; ++p)
 		if (strncasecmp(s, *p, 3) == 0)
 			return (int)(p - months) + 1;
 	return 0;
+}
 static int
 getday(char *s)