From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 24 Nov 2021 14:05:15 +0000 (+0100)
Subject: ntp: improve check for PTP socket
X-Git-Tag: 4.2-pre1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7a444593fb9469b224cd656dc052b2d0ed51ce7;p=thirdparty%2Fchrony.git

ntp: improve check for PTP socket

Check for INVALID_SOCK_FD in case the PTP port is enabled, but opening
one of the PTP sockets failed.
---

diff --git a/ntp_io.c b/ntp_io.c
index 077a7cff..b9d5f13a 100644
--- a/ntp_io.c
+++ b/ntp_io.c
@@ -332,7 +332,8 @@ NIO_OpenServerSocket(NTP_Remote_Address *remote_addr)
 static int
 is_ptp_socket(int sock_fd)
 {
-  return ptp_port > 0 && (sock_fd == ptp_sock_fd4 || sock_fd == ptp_sock_fd6);
+  return ptp_port > 0 && sock_fd != INVALID_SOCK_FD &&
+    (sock_fd == ptp_sock_fd4 || sock_fd == ptp_sock_fd6);
 }
 
 /* ================================================== */