From 138484b6d22fc61e16f0234108e6072500d42007 Mon Sep 17 00:00:00 2001
From: reyk <>
Date: Wed, 12 Oct 2016 11:57:31 +0000
Subject: [PATCH] copy updated log.c from vmd: for correctness, save errno when
 doing additional actions before printing it.  OK rzalamena@

---
 src/usr.sbin/ntpd/log.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/usr.sbin/ntpd/log.c b/src/usr.sbin/ntpd/log.c
index 5b35b33e..52df59c0 100644
--- a/src/usr.sbin/ntpd/log.c
+++ b/src/usr.sbin/ntpd/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.13 2015/12/19 17:55:29 reyk Exp $	*/
+/*	$OpenBSD: log.c,v 1.14 2016/10/12 11:57:31 reyk Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -109,19 +109,21 @@ vlog(int pri, const char *fmt, va_list ap)
 void
 log_warn(const char *emsg, ...)
 {
-	char	*nfmt;
-	va_list	 ap;
+	char		*nfmt;
+	va_list		 ap;
+	int		 saved_errno = errno;
 
 	/* best effort to even work in out of memory situations */
 	if (emsg == NULL)
-		logit(LOG_CRIT, "%s", strerror(errno));
+		logit(LOG_CRIT, "%s", strerror(saved_errno));
 	else {
 		va_start(ap, emsg);
 
-		if (asprintf(&nfmt, "%s: %s", emsg, strerror(errno)) == -1) {
+		if (asprintf(&nfmt, "%s: %s", emsg,
+		    strerror(saved_errno)) == -1) {
 			/* we tried it... */
 			vlog(LOG_CRIT, emsg, ap);
-			logit(LOG_CRIT, "%s", strerror(errno));
+			logit(LOG_CRIT, "%s", strerror(saved_errno));
 		} else {
 			vlog(LOG_CRIT, nfmt, ap);
 			free(nfmt);
@@ -167,6 +169,7 @@ vfatal(const char *emsg, va_list ap)
 {
 	static char	s[BUFSIZ];
 	const char	*sep;
+	int		 saved_errno = errno;
 
 	if (emsg != NULL) {
 		(void)vsnprintf(s, sizeof(s), emsg, ap);
@@ -175,9 +178,9 @@ vfatal(const char *emsg, va_list ap)
 		s[0] = '\0';
 		sep = "";
 	}
-	if (errno)
+	if (saved_errno)
 		logit(LOG_CRIT, "%s: %s%s%s",
-		    log_procname, s, sep, strerror(errno));
+		    log_procname, s, sep, strerror(saved_errno));
 	else
 		logit(LOG_CRIT, "%s%s%s", log_procname, sep, s);
 }