diff options
| author | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2015-10-26 11:35:40 +0000 |
| commit | c62812877398840dae0ba74b03e9e6a43cc56fc5 (patch) | |
| tree | 304551aa93f09787d4f56a966c6409faf1b1bcb0 /contrib/ntp/libntp/socket.c | |
| parent | 9e809ce638c9be9ffb800ced1b91c0e8997f4c9e (diff) | |
| download | FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.zip FreeBSD-src-c62812877398840dae0ba74b03e9e6a43cc56fc5.tar.gz | |
Upgrade NTP to 4.2.8p4.
Security: FreeBSD-SA-15:25.ntp
Security: CVE-2015-7871
Security: CVE-2015-7855
Security: CVE-2015-7854
Security: CVE-2015-7853
Security: CVE-2015-7852
Security: CVE-2015-7851
Security: CVE-2015-7850
Security: CVE-2015-7849
Security: CVE-2015-7848
Security: CVE-2015-7701
Security: CVE-2015-7703
Security: CVE-2015-7704, CVE-2015-7705
Security: CVE-2015-7691, CVE-2015-7692, CVE-2015-7702
Diffstat (limited to 'contrib/ntp/libntp/socket.c')
| -rw-r--r-- | contrib/ntp/libntp/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/ntp/libntp/socket.c b/contrib/ntp/libntp/socket.c index de678c6..11fb0046 100644 --- a/contrib/ntp/libntp/socket.c +++ b/contrib/ntp/libntp/socket.c @@ -78,7 +78,7 @@ move_fd( static SOCKET socket_boundary = -1; SOCKET newfd; - NTP_REQUIRE((int)fd >= 0); + REQUIRE((int)fd >= 0); /* * check whether boundary has be set up @@ -115,7 +115,7 @@ move_fd( socket_boundary)); } while (socket_boundary > 0); #else - NTP_REQUIRE((int)fd >= 0); + ENSURE((int)fd >= 0); #endif /* !defined(SYS_WINNT) && defined(F_DUPFD) */ return fd; } |
