diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-08-27 19:31:46 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-08-27 19:31:46 -0700 |
| commit | ebfbb7f452f9d5daea451cd87ae72012c066eae4 (patch) | |
| tree | 2ab481bdb7bd095ff54c843a6cea666aca27131e /node | |
| parent | 7d676ad16ab14719c892d0e8ebb7bf0944bd72e6 (diff) | |
| parent | 5db538d85ef739fa969a5b71d294501ac0bb5335 (diff) | |
| download | infinitytier-ebfbb7f452f9d5daea451cd87ae72012c066eae4.tar.gz infinitytier-ebfbb7f452f9d5daea451cd87ae72012c066eae4.zip | |
Merge branch 'master' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into android-jni
Diffstat (limited to 'node')
| -rw-r--r-- | node/Node.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node/Node.cpp b/node/Node.cpp index d40ceab9..534c085d 100644 --- a/node/Node.cpp +++ b/node/Node.cpp @@ -136,7 +136,7 @@ Node::Node( if (!Topology::authenticateRootTopology(rt)) rt.clear(); } - if (!rt.size()) + if ((!rt.size())||(!rt.contains("rootservers"))) rt.fromString(ZT_DEFAULTS.defaultRootTopology); } RR->topology->setRootServers(Dictionary(rt.get("rootservers",""))); |