Merge branch 'master' into dev

2022-04-13 19:55:22 -04:00
parent 8217cadc08 1294767b44
commit f0b0172434
9 changed files with 116 additions and 33 deletions
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -2294,6 +2294,7 @@ public:
 						fprintf(stderr,"ERROR: unable to add ip address %s" ZT_EOL_S, ip->toString(ipbuf));
 				}
 			}
+#endif

 #ifdef __APPLE__
 			if (!MacDNSHelper::addIps(n.config().nwid, n.config().mac, n.tap()->deviceName().c_str(), newManagedIps))