Merge branch 'pr/1454'

* pr/1454:
  NEWS: Mention check_dhcp fix
  properly remove MSG_PEEK in check_dhcp.c. Fixes #1450.
This commit is contained in:
Holger Weiss 2016-12-07 21:10:08 +01:00
commit 2724eb00de
2 changed files with 5 additions and 1 deletions

4
NEWS
View file

@ -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"

View file

@ -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);