From 22efa1ab53fcd484657161841468810b43ea1d0d Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Sun, 26 Jan 2014 10:21:43 -0800 Subject: Windows Installer work, fix 100% CPU bug in EthernetTap on Windows, Windows lockDownFile() implementation that uses 'cacls' utility. --- node/Topology.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'node/Topology.cpp') diff --git a/node/Topology.cpp b/node/Topology.cpp index 6efde33e..b499063c 100644 --- a/node/Topology.cpp +++ b/node/Topology.cpp @@ -280,17 +280,13 @@ void Topology::_loadPeers() buf.setSize(buf.size() - ptr); } } while (rlen > 0); - fclose(pd); - } else { - fclose(pd); - Utils::rm(pdpath); } } catch ( ... ) { - // Membership cert dump file invalid. We'll re-learn them off the net. _activePeers.clear(); - fclose(pd); - Utils::rm(pdpath); } + + fclose(pd); + Utils::rm(pdpath); } } // namespace ZeroTier -- cgit v1.2.3