Browse Source

Fix the FD leak fix, and release notes.

Adam Ierymenko 3 years ago
parent
commit
65549cb0da
2 changed files with 2 additions and 2 deletions
  1. 1 0
      RELEASE-NOTES.md
  2. 1 2
      osdep/Binder.hpp

+ 1 - 0
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
 

+ 1 - 2
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
 			}