From ed0d0102861a6025c0ca2a65e4b6b0dd229a962a Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Thu, 8 Dec 2016 13:50:48 +0100 Subject: [PATCH] Apply d/p/11_check_dhcp_MSG_PEAK --- debian/patches/11_check_dhcp_MSG_PEAK | 22 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 23 insertions(+) create mode 100644 debian/patches/11_check_dhcp_MSG_PEAK diff --git a/debian/patches/11_check_dhcp_MSG_PEAK b/debian/patches/11_check_dhcp_MSG_PEAK new file mode 100644 index 0000000..d3ab64c --- /dev/null +++ b/debian/patches/11_check_dhcp_MSG_PEAK @@ -0,0 +1,22 @@ +From c7f7959dd90e2b82bb1904a02e11f4b5e0f35709 Mon Sep 17 00:00:00 2001 +From: Harald Koch +Date: Wed, 7 Dec 2016 13:11:40 -0500 +Subject: [PATCH] properly remove MSG_PEEK in check_dhcp.c. Fixes #1450. + +--- + plugins-root/check_dhcp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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); + diff --git a/debian/patches/series b/debian/patches/series index 87d2594..dd728fd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 02_check_icmp_links # commited upstream 10_spell_fixes +11_check_dhcp_MSG_PEAK