From 9dd09ec3318bc1a31ce69a92bdcad342654f18d5 Mon Sep 17 00:00:00 2001
From: Harald Koch <chk@anemone.chk.cfrq.net>
Date: Wed, 7 Dec 2016 13:11:40 -0500
Subject: properly remove MSG_PEEK in check_dhcp.c. Fixes #1450.


diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 88b7ca1..f4c2daf 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -693,7 +693,7 @@ int receive_dhcp_packet(void *buffer, int buffer_size, int sock, int timeout, st
         else{
 		bzero(&source_address,sizeof(source_address));
 		address_size=sizeof(source_address);
-                recv_result=recvfrom(sock,(char *)buffer,buffer_size,MSG_PEEK,(struct sockaddr *)&source_address,&address_size);
+                recv_result=recvfrom(sock,(char *)buffer,buffer_size,0,(struct sockaddr *)&source_address,&address_size);
 		if(verbose)
 			printf("recv_result: %d\n",recv_result);
 
-- 
cgit v0.10-9-g596f


From 21e57d31d9ab0f9f8db09b10c9c5cad26f54764c Mon Sep 17 00:00:00 2001
From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Wed, 7 Dec 2016 21:09:49 +0100
Subject: NEWS: Mention check_dhcp fix


diff --git a/NEWS b/NEWS
index b094470..9462d7a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 This file documents the major additions and syntax changes between releases.
 
+2.3 [...]
+	FIXES
+	Fix regression where check_dhcp was rereading response in a tight loop
+
 2.2 29th November 2016
 	ENHANCEMENTS
 	The check_http -S/--ssl option now accepts the arguments "1.1" and "1.2"
-- 
cgit v0.10-9-g596f