diff --git a/controller/DB.cpp b/controller/DB.cpp index 827f549d1..4cce312ed 100644 --- a/controller/DB.cpp +++ b/controller/DB.cpp @@ -520,8 +520,6 @@ void DB::_networkChanged(nlohmann::json& old, nlohmann::json& networkConfig, boo std::cerr << "Error deauthorizing members on network delete: " << e.what() << std::endl; } - this->eraseNetwork(networkId); - // delete the network std::unique_lock l(_networks_l); _networks.erase(networkId); diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp index dda0b1f01..dcc747e68 100644 --- a/controller/EmbeddedNetworkController.cpp +++ b/controller/EmbeddedNetworkController.cpp @@ -612,11 +612,11 @@ void EmbeddedNetworkController::init(const Identity& signingId, Sender* sender) #ifdef ZT_CONTROLLER_USE_LIBPQ if ((_path.length() > 9) && (_path.substr(0, 9) == "postgres:")) { fprintf(stderr, "CV1\n"); - _db.addDB(std::shared_ptr(new CV1(_signingId, _path.substr(9).c_str(), _listenPort, _rc))); + _db.addDB(std::shared_ptr(new CV1(_signingId, _path.substr(9).c_str(), _listenPort, _rc))); } else if ((_path.length() > 4) && (_path.substr(0, 4) == "cv2:")) { fprintf(stderr, "CV2\n"); - _db.addDB(std::shared_ptr(new CV2(_signingId, _path.substr(4).c_str(), _listenPort))); + _db.addDB(std::shared_ptr(new CV2(_signingId, _path.substr(4).c_str(), _listenPort))); } else { fprintf(stderr, "FileDB\n");