 @@ -1,41 +1,41 @@
-/*	$NetBSD: do_command.c,v 1.8 2017/06/09 17:36:30 christos Exp $	*/
+/*	$NetBSD: do_command.c,v 1.9 2017/08/17 08:53:00 christos 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: do_command.c,v 1.9 2004/01/23 18:56:42 vixie Exp";
 #else
-__RCSID("$NetBSD: do_command.c,v 1.8 2017/06/09 17:36:30 christos Exp $");
+__RCSID("$NetBSD: do_command.c,v 1.9 2017/08/17 08:53:00 christos Exp $");
 #endif
 #endif
 #include "cron.h"
 #include <unistd.h>
 static int		child_process(entry *);
 static int		safe_p(const char *, const char *);
 void
 do_command(entry *e, user *u) {
 	int retval;
 @@ -474,34 +474,36 @@ child_process(entry *e) {
 			/* if we are supposed to be mailing, MAILTO will
 			 * be non-NULL.  only in this case should we set
 			 * up the mail command and subjects and stuff...
 			 */
 			if (mailto && safe_p(usernm, mailto)) {
 				char	**env;
 				char	mailcmd[MAX_COMMAND];
 				char	hostname[MAXHOSTNAMELEN + 1];
 				(void)gethostname(hostname, MAXHOSTNAMELEN);
 				if (strlens(MAILFMT, MAILARG, NULL) + 1
 				    >= sizeof mailcmd) {
-					warnx("mailcmd too long");
+					log_it(usernm, getpid(), "MAIL",
 					    "mailcmd too long");
 					retval = ERROR_EXIT;
 					goto child_process_end;
+				}
 				(void)snprintf(mailcmd, sizeof(mailcmd),
 				    MAILFMT, MAILARG);
 				if (!(mail = cron_popen(mailcmd, "w", e->pwd))) {
-					warn("cannot run `%s'", mailcmd);
+					log_itx(usernm, getpid(), "MAIL",
 					    "cannot run `%s'", mailcmd);
 					retval = ERROR_EXIT;
 					goto child_process_end;
+				}
 				(void)fprintf(mail,
 				    "From: root (Cron Daemon)\n");
 				(void)fprintf(mail, "To: %s\n", mailto);
 				(void)fprintf(mail,
 				    "Subject: Cron <%s@%s> %s\n",
 				    usernm, hostname, e->cmd);
 				(void)fprintf(mail,
 				    "Auto-Submitted: auto-generated\n");
 #ifdef MAIL_DATE
 				(void)fprintf(mail, "Date: %s\n",
 @@ -539,33 +541,30 @@ child_process(entry *e) {
 				 * the termination of the grandchild
 				 * in addition to the mail process, since
 				 * it (the grandchild) is likely to exit
 				 * after closing its stdout.
 				 */
 				status = cron_pclose(mail);
+			}
 			/* if there was output and we could not mail it,
 			 * log the facts so the poor user can figure out
 			 * what's going on.
 			 */
 			if (mailto && status) {
-				char buf[MAX_TEMPSTR];
+				log_itx(usernm, getpid(), "MAIL",
 				    "mailed %d byte%s of output but got status"
-				(void)snprintf(buf, sizeof(buf),
+				    " %#04x", bytes, bytes == 1 ? "" : "s",
-			"mailed %d byte%s of output but got status 0x%04x\n",
+				    status);
 					bytes, (bytes==1)?"":"s",
 					status);
 				log_it(usernm, getpid(), "MAIL", buf);
+			}
 		} /*if data from grandchild*/
 		Debug(DPROC, ("[%ld] got EOF from grandchild\n",
 			      (long)getpid()));
 		(void)fclose(in);	/* also closes stdout_pipe[READ_PIPE] */
+	}
 	/* wait for children to die.
 	 */
 	sigchld_handler(0);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: funcs.h,v 1.4 2017/06/09 17:36:30 christos Exp $	*/
+/*	$NetBSD: funcs.h,v 1.5 2017/08/17 08:53:00 christos Exp $	*/
 /*
  * Id: funcs.h,v 1.9 2004/01/23 18:56:42 vixie Exp
  */
 /*
  * 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.
+ *
 @@ -34,26 +34,31 @@ void		set_cron_uid(void),
 		job_add(entry *, user *, time_t),
 		do_command(entry *, user *),
 		link_user(cron_db *, user *),
 		unlink_user(cron_db *, user *),
 		free_user(user *),
 		env_free(char **),
 		unget_char(int, FILE *),
 		free_entry(entry *),
 		acquire_daemonlock(int),
 		skip_comments(FILE *),
 		log_it(const char *, int, const char *, const char *),
 		log_close(void);
 void
 		log_itx(const char *, int, const char *, const char *, ...)
 		    __printflike(4, 5);
 int		job_runqueue(void),
 		set_debug_flags(const char *),
 		get_char(FILE *),
 		get_string(char *, int, FILE *, const char *),
 		load_env(char *, FILE *),
 		cron_pclose(FILE *),
 		glue_strings(char *, size_t, const char *, const char *, char),
 		strcmp_until(const char *, const char *, char),
 		strdtb(char *);
 size_t		strlens(const char *, ...);
 char		*env_get(const char *, char **),

 @@ -1,41 +1,41 @@
-/*	$NetBSD: misc.c,v 1.4 2017/06/09 17:36:30 christos Exp $	*/
+/*	$NetBSD: misc.c,v 1.5 2017/08/17 08:53:00 christos 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: misc.c,v 1.16 2004/01/23 18:56:43 vixie Exp";
 #else
-__RCSID("$NetBSD: misc.c,v 1.4 2017/06/09 17:36:30 christos Exp $");
+__RCSID("$NetBSD: misc.c,v 1.5 2017/08/17 08:53:00 christos Exp $");
 #endif
 #endif
 /* vix 26jan87 [RCS has the rest of the log]
  * vix 30dec86 [written]
  */
 #include "cron.h"
 #include <limits.h>
 #include <vis.h>
 #if defined(SYSLOG) && defined(LOG_FILE)
 # undef LOG_FILE
 @@ -302,61 +302,58 @@ acquire_daemonlock(int closeflag) {
 	if (closeflag) {
 		/* close stashed fd for child so we don't leak it. */
 		if (fd != -1) {
 			(void)close(fd);
 			fd = -1;
+		}
 		return;
+	}
 	if (fd == -1) {
 		pidfile = _PATH_CRON_PID;
 		/* Initial mode is 0600 to prevent flock() race/DoS. */
 		if ((fd = open(pidfile, O_RDWR|O_CREAT, 0600)) == -1) {
-			(void)snprintf(buf, sizeof(buf),
+			log_itx("CRON", getpid(), "DEATH",
-				"can't open or create %s: %s",
+			    "can't open or create %s: %s",
-				pidfile, strerror(errno));
+			    pidfile, strerror(errno));
-			log_it("CRON", getpid(), "DEATH", buf);
+			exit(ERROR_EXIT);
 			errx(ERROR_EXIT, "%s", buf);
+		}
 		/* fd must be > STDERR since we dup fd 0-2 to /dev/null */
 		if (fd <= STDERR) {
 			if (dup2(fd, STDERR + 1) < 0) {
-				snprintf(buf, sizeof buf,
+				log_itx("CRON", getpid(), "DEATH",
 				    "can't dup pid fd: %s", strerror(errno));
 				log_it("CRON", getpid(), "DEATH", buf);
  				exit(ERROR_EXIT);
+ 			}
 			close(fd);
 			fd = STDERR + 1;
+		}
 		if (flock(fd, LOCK_EX|LOCK_NB) < OK) {
 			int save_errno = errno;
 			memset(buf, 0, sizeof(buf));
 			if ((num = read(fd, buf, sizeof(buf) - 1)) > 0 &&
 			    (otherpid = strtol(buf, &ep, 10)) > 0 &&
 			    ep != buf && *ep == '\n' && otherpid != LONG_MAX) {
-				(void)snprintf(buf, sizeof(buf),
+				log_itx("CRON", getpid(), "DEATH",
 				    "can't lock %s, otherpid may be %ld: %s",
 				    pidfile, otherpid, strerror(save_errno));
 			} else {
-				(void)snprintf(buf, sizeof(buf),
+				log_itx("CRON", getpid(), "DEATH",
 				    "can't lock %s, otherpid unknown: %s",
 				    pidfile, strerror(save_errno));
+			}
-			log_it("CRON", getpid(), "DEATH", buf);
+			exit(ERROR_EXIT);
 			errx(ERROR_EXIT, "%s", buf);
+		}
 		(void) fchmod(fd, 0644);
 		(void) fcntl(fd, F_SETFD, 1);
+	}
 	(void)snprintf(buf, sizeof(buf), "%ld\n", (long)getpid());
 	(void) lseek(fd, (off_t)0, SEEK_SET);
 	num = write(fd, buf, strlen(buf));
 	(void) ftruncate(fd, num);
 	/* abandon fd even though the file is open. we need to keep
 	 * it open and locked, but we don't need the handles elsewhere.
 	 */
 @@ -434,70 +431,74 @@ skip_comments(FILE *file) {
 		while (ch != '\n' && ch != EOF)
 			ch = get_char(file);
 		/* ch is now the newline of a line which we're going to
 		 * ignore.
 		 */
+	}
 	if (ch != EOF)
 		unget_char(ch, file);
+}
 void
 log_itx(const char *username, PID_T xpid, const char *event, const char *fmt,
     ...)
+{
 	char *detail;
 	va_list ap;
 	va_start(ap, fmt);
 	if (vasprintf(&detail, fmt, ap) == -1) {
 		va_end(ap);
 		return;
+	}
 	log_it(username, xpid, event, detail);
 	free(detail);
+}
 void
 log_it(const char *username, PID_T xpid, const char *event, const char *detail) {
 #if defined(LOG_FILE) || DEBUGGING
 	PID_T pid = xpid;
 #endif
 #if defined(LOG_FILE)
 	char *msg;
-	size_t msglen;
+	int msglen;
 	TIME_T now = time((TIME_T) 0);
 	struct tm *t = localtime(&now);
 #endif /*LOG_FILE*/
 #if defined(LOG_FILE)
 	/* we assume that MAX_TEMPSTR will hold the date, time, &punctuation.
 	 */
 	msglen = strlen(username) + strlen(event) + strlen(detail) +
 	    MAX_TEMPSTR);
 	msg = malloc(msglen);
 	if (msg == NULL)
 		return;
 	if (LogFD < OK) {
 		LogFD = open(LOG_FILE, O_WRONLY|O_APPEND|O_CREAT, 0600);
 		if (LogFD < OK) {
 			warn("can't open log file `%s'", LOG_FILE);
 		} else {
 			(void) fcntl(LogFD, F_SETFD, FD_CLOEXEC);
+		}
+	}
 	/* we have to sprintf() it because fprintf() doesn't always write
 	 * everything out in one chunk and this has to be atomically appended
 	 * to the log file.
 	 */
-	(void)snprintf(msg, msglen,
+	msglen = asprintf(&msg,
-		"%s (%02d/%02d-%02d:%02d:%02d-%d) %s (%s)\n",
+	    "%s (%02d/%02d-%02d:%02d:%02d-%d) %s (%s)\n", username,
-		username,
+	    t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, pid,
-		t->tm_mon+1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, pid,
+	    event, detail);
-		event, detail);
+	if (msglen == -1)
 		return;
-	/* we have to run strlen() because sprintf() returns (char*) on old BSD
+	if (LogFD < OK || write(LogFD, msg, (size_t)msglen) < OK) {
 	 */
 	if (LogFD < OK || write(LogFD, msg, strlen(msg)) < OK) {
 		warn("can't write to log file");
-		write(STDERR, msg, strlen(msg));
+		write(STDERR, msg, (size_t)msglen);
+	}
 	free(msg);
 #endif /*LOG_FILE*/
 #if defined(SYSLOG)
 	if (!syslog_open) {
 # ifdef LOG_DAEMON
 		openlog(getprogname(), LOG_PID, FACILITY);
 # else
 		openlog(getprogname(), LOG_PID);
 # endif
 		syslog_open = TRUE;		/* assume openlog success */