diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index a74a4f4da..062bafede 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -5,6 +5,7 @@ ZeroTier Release Notes * Remove problematic spinlock, which was only used on x86_64 anyway. Just use pthread always. * Fix fd leak on MacOS that caused non-responsiveness after some time. + * Fix Debian install scripts to set /usr/sbin/nologin as shell on service user. # 2021-11-08 -- Version 1.8.2 diff --git a/osdep/Binder.hpp b/osdep/Binder.hpp index f55fa5c8d..0c7ec4465 100644 --- a/osdep/Binder.hpp +++ b/osdep/Binder.hpp @@ -336,7 +336,6 @@ class Binder { // if this is a temporary IPv6 address, skip to the next address if (flags & IN6_IFF_TEMPORARY) { - close(infoSock); char buf[64]; #ifdef ZT_TRACE fprintf(stderr, "skip binding to temporary IPv6 address: %s\n", ip.toIpString(buf)); @@ -369,7 +368,7 @@ class Binder { else { interfacesEnumerated = false; } -#if defined(__unix__) && !defined(__LINUX__) +#if (defined(__unix__) || defined(__APPLE__)) && !defined(__LINUX__) close(infoSock); #endif }