Browse Source

let's try this

Grant Limberg 3 weeks ago
parent
commit
5494c44a30
2 changed files with 2 additions and 4 deletions
  1. 0 2
      controller/DB.cpp
  2. 2 2
      controller/EmbeddedNetworkController.cpp

+ 0 - 2
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<std::shared_mutex> l(_networks_l);
 			_networks.erase(networkId);

+ 2 - 2
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<DB>(new CV1(_signingId, _path.substr(9).c_str(), _listenPort, _rc)));
+		_db.addDB(std::shared_ptr<CV1>(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<DB>(new CV2(_signingId, _path.substr(4).c_str(), _listenPort)));
+		_db.addDB(std::shared_ptr<CV2>(new CV2(_signingId, _path.substr(4).c_str(), _listenPort)));
 	}
 	else {
 		fprintf(stderr, "FileDB\n");