From 231a5ec47dcdd6da13a81f2da26cfff69f2ef904 Mon Sep 17 00:00:00 2001
From: ckuethe <ckuethe@openbsd.org>
Date: Sun, 17 Sep 2006 17:03:56 +0000
Subject: Make rdate ignore ntp responses with ALARM status. "yeah..." henning@

---
 usr.sbin/rdate/ntp.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'usr.sbin/rdate')

diff --git a/usr.sbin/rdate/ntp.c b/usr.sbin/rdate/ntp.c
index 46b11f512a4..96c9c738ce6 100644
--- a/usr.sbin/rdate/ntp.c
+++ b/usr.sbin/rdate/ntp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntp.c,v 1.28 2006/03/14 22:56:20 deraadt Exp $	*/
+/*	$OpenBSD: ntp.c,v 1.29 2006/09/17 17:03:56 ckuethe Exp $	*/
 
 /*
  * Copyright (c) 1996, 1997 by N.M. Maclaren. All rights reserved.
@@ -241,6 +241,11 @@ sync_ntp(int fd, const struct sockaddr *peer, double *offset, double *error)
 			return (-1);
 		}
 
+		if ((data.status & STATUS_ALARM) == STATUS_ALARM) {
+			warnx("Ignoring NTP server with alarm flag set");
+			return (-1);
+		}
+
 		if (*error <= minerr)
 			break;
 	}
-- 
cgit v1.2.3-59-g8ed1b