void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 21:13:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

GitHub issue #979

Browse source
This commit is contained in:
Adam Ierymenko 2019-08-02 13:59:03 -07:00
parent 34364ab8ee
commit fdc708a624
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
service/OneService.cpp
View file

@ -994,6 +994,7 @@ public:
Mutex::Lock _l2(_localConfig_m); Mutex::Lock _l2(_localConfig_m);
std::string lcbuf; std::string lcbuf;
if (OSUtils::readFile((_homePath + ZT_PATH_SEPARATOR_S "local.conf").c_str(),lcbuf)) { if (OSUtils::readFile((_homePath + ZT_PATH_SEPARATOR_S "local.conf").c_str(),lcbuf)) {
if (lcbuf.length() > 0) {
try { try {
_localConfig = OSUtils::jsonParse(lcbuf); _localConfig = OSUtils::jsonParse(lcbuf);
if (!_localConfig.is_object()) { if (!_localConfig.is_object()) {
@ -1005,6 +1006,7 @@ public:
exit(1); exit(1);
} }
} }
}
// Get any trusted paths in local.conf (we'll parse the rest of physical[] elsewhere) // Get any trusted paths in local.conf (we'll parse the rest of physical[] elsewhere)
json &physical = _localConfig["physical"]; json &physical = _localConfig["physical"];