Browse Source

Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev

pull/2/head
Adam Ierymenko 5 years ago
parent
commit
547b0de8a5
No known key found for this signature in database
GPG Key ID: C8877CF2D7A5D7F3
  1. 3
      controller/FileDB.cpp
  2. 24771
      ext/json/json.hpp

3
controller/FileDB.cpp

@ -140,8 +140,7 @@ void FileDB::eraseNetwork(const uint64_t networkId)
void FileDB::eraseMember(const uint64_t networkId,const uint64_t memberId)
{
nlohmann::json network,member,nullJson;
get(networkId,network);
get(memberId,member);
get(networkId,network,memberId,member);
char p[4096];
OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "%.16llx" ZT_PATH_SEPARATOR_S "member" ZT_PATH_SEPARATOR_S "%.10llx.json",_networksPath.c_str(),networkId,memberId);
OSUtils::rm(p);

24771
ext/json/json.hpp

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save