From b4844efed8860b9a3d2a1b5a9c0de2b71b1b4a0d Mon Sep 17 00:00:00 2001 From: otto Date: Mon, 22 Jun 2020 06:11:34 +0000 Subject: When the main process exits, it closes the pipe so a read 0 occurs. Move log level to debug for that case and while there correct the string, we're reding, not writing. --- usr.sbin/ntpd/ntp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/ntpd/ntp.c b/usr.sbin/ntpd/ntp.c index ec3d6bc431f..015aea3631e 100644 --- a/usr.sbin/ntpd/ntp.c +++ b/usr.sbin/ntpd/ntp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntp.c,v 1.164 2020/04/11 07:49:48 otto Exp $ */ +/* $OpenBSD: ntp.c,v 1.165 2020/06/22 06:11:34 otto Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -365,7 +365,7 @@ ntp_main(struct ntpd_conf *nconf, struct passwd *pw, int argc, char **argv) if (nfds > 0 && pfd[PFD_PIPE_MAIN].revents & (POLLIN|POLLERR)) { nfds--; if (ntp_dispatch_imsg() == -1) { - log_warn("pipe write error (from main)"); + log_debug("pipe read error (from main)"); ntp_quit = 1; } } @@ -380,7 +380,7 @@ ntp_main(struct ntpd_conf *nconf, struct passwd *pw, int argc, char **argv) if (nfds > 0 && pfd[PFD_PIPE_DNS].revents & (POLLIN|POLLERR)) { nfds--; if (ntp_dispatch_imsg_dns() == -1) { - log_warn("pipe write error (from dns engine)"); + log_warn("pipe read error (from dns engine)"); ntp_quit = 1; } } -- cgit v1.2.3-59-g8ed1b