Fix check_ntp_time.

It periodically returns "Socket timeout" when one of several ntp server
doesn't response.

PR:		224926
Submitted by:	admins perceptyx com
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2018-01-08 13:38:55 +00:00
parent 6c060282c4
commit 0ef198c197
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=458415
2 changed files with 16 additions and 1 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= nagios-plugins
PORTVERSION= 2.2.1
PORTREVISION= 5
PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= https://www.nagios-plugins.org/download/ \

View File

@ -0,0 +1,15 @@
Obtained from:
https://github.com/nagios-plugins/nagios-plugins/commit/df485c74f582708d6ce37cdf99880fe75215498a
--- plugins/check_ntp_time.c.orig 2018-01-04 12:59:01.422087000 -0800
+++ plugins/check_ntp_time.c 2018-01-04 13:05:56.317152000 -0800
@@ -415,6 +415,9 @@
}
}
/* lather, rinse, repeat. */
+ /* break if we have one response but other ntp servers doesn't response */
+ /* greater than timeout_interval/2 */
+ if (servers_completed && now_time-start_ts > timeout_interval/2) break;
}
if (one_read == 0) {