summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2016-12-07 20:10:08 (GMT)
committerHolger Weiss <holger@zedat.fu-berlin.de>2016-12-07 20:10:08 (GMT)
commit2724eb00de0f685615cdf9f0e492ef3dbe323433 (patch)
treee0cfbd348431f8742bb930416041288293c7c15e
parentbc4842ab7d0a378a98ee6d37e42bb928c51f9e41 (diff)
parent21e57d31d9ab0f9f8db09b10c9c5cad26f54764c (diff)
downloadmonitoring-plugins-2724eb00de0f685615cdf9f0e492ef3dbe323433.tar.gz
Merge branch 'pr/1454'
* pr/1454: NEWS: Mention check_dhcp fix properly remove MSG_PEEK in check_dhcp.c. Fixes #1450.
-rw-r--r--NEWS4
-rw-r--r--plugins-root/check_dhcp.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index b094470..9462d7a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
1This file documents the major additions and syntax changes between releases. 1This file documents the major additions and syntax changes between releases.
2 2
32.3 [...]
4 FIXES
5 Fix regression where check_dhcp was rereading response in a tight loop
6
32.2 29th November 2016 72.2 29th November 2016
4 ENHANCEMENTS 8 ENHANCEMENTS
5 The check_http -S/--ssl option now accepts the arguments "1.1" and "1.2" 9 The check_http -S/--ssl option now accepts the arguments "1.1" and "1.2"
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
693 else{ 693 else{
694 bzero(&source_address,sizeof(source_address)); 694 bzero(&source_address,sizeof(source_address));
695 address_size=sizeof(source_address); 695 address_size=sizeof(source_address);
696 recv_result=recvfrom(sock,(char *)buffer,buffer_size,MSG_PEEK,(struct sockaddr *)&source_address,&address_size); 696 recv_result=recvfrom(sock,(char *)buffer,buffer_size,0,(struct sockaddr *)&source_address,&address_size);
697 if(verbose) 697 if(verbose)
698 printf("recv_result: %d\n",recv_result); 698 printf("recv_result: %d\n",recv_result);
699 699