From e310ae01b8b8272280f08e2a74007ac4249e18bb Mon Sep 17 00:00:00 2001
From: henning <>
Date: Wed, 13 Oct 2004 09:20:41 +0000
Subject: [PATCH] when we get back a IMSG_HOST_DNS message from the parent the
 peer ID within might have become invalid (because the peer showed up, dns
 request sent to parent, peer vanishes, and then the reply comes back), so do
 not fatal() in that case but just log_warnx(). provoked by brad

---
 src/usr.sbin/ntpd/ntp.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/usr.sbin/ntpd/ntp.c b/src/usr.sbin/ntpd/ntp.c
index bbc4fd6c..53a0382c 100644
--- a/src/usr.sbin/ntpd/ntp.c
+++ b/src/usr.sbin/ntpd/ntp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntp.c,v 1.34 2004/10/04 11:12:58 henning Exp $ */
+/*	$OpenBSD: ntp.c,v 1.35 2004/10/13 09:20:41 henning Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -285,8 +285,10 @@ ntp_dispatch_imsg(void)
 			TAILQ_FOREACH(peer, &conf->ntp_peers, entry)
 				if (peer->id == imsg.hdr.peerid)
 					break;
-			if (peer == NULL)
-				fatal("IMSG_HOST_DNS with invalid peerID");
+			if (peer == NULL) {
+				log_warnx("IMSG_HOST_DNS with invalid peerID");
+				break;
+			}
 			if (peer->addr != NULL) {
 				log_warnx("IMSG_HOST_DNS but addr != NULL!");
 				break;