From b5e14a1344528861a7016aa2c6b0f2e9630d1526 Mon Sep 17 00:00:00 2001
From: Cy Schubert <cy@FreeBSD.org>
Date: Sat, 20 Dec 2014 22:52:39 +0000
Subject: Vendor import ntp 4.2.8.

Reviewed by:	roberto
Security:	VUXML: 4033d826-87dd-11e4-9079-3c970e169bc2
Security:	http://www.kb.cert.org/vuls/id/852879
Security:	CVE-2014-9293
Security	CVE-2014-9294
Security	CVE-2014-9295
Security	CVE-2014-9296
---
 libntp/ntp_lineedit.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'libntp/ntp_lineedit.c')

diff --git a/libntp/ntp_lineedit.c b/libntp/ntp_lineedit.c
index 55fdf0430ee8..c5aad3108614 100644
--- a/libntp/ntp_lineedit.c
+++ b/libntp/ntp_lineedit.c
@@ -93,8 +93,7 @@ ntp_readline_init(
 
 			if (NULL == ntp_hist) {
 
-				fprintf(stderr, "history_init(): %s\n",
-						strerror(errno));
+				mfprintf(stderr, "history_init(): %m\n");
 				fflush(stderr);
 
 				el_end(ntp_el);
@@ -103,7 +102,7 @@ ntp_readline_init(
 				success = 0;
 
 			} else {
-				memset(&hev, 0, sizeof(hev));
+				ZERO(hev);
 #ifdef H_SETSIZE
 				history(ntp_hist, &hev, H_SETSIZE, 128);
 #endif
-- 
cgit v1.2.3