libtransport.git Changeset - 996a48005b0d

Changeset - 996a48005b0d

Parent rev.

Child rev.

[Not reviewed]

0 2 0

HanzZ - 13 years ago 2012-04-09 09:27:26
hanzz.k@gmail.com

more fixes

2 files changed with 11 insertions and 14 deletions:

spectrum_manager/src/main.cpp

src/userregistry.cpp

0 comments (0 inline, 0 general)

spectrum_manager/src/main.cpp

➞

Show inline comments

 			if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
 				Config cfg;
 				if (cfg.load(itr->path().string()) == false) {
 					std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
+				}
-				if (CONFIG_STRING(&cfg, "service.admin_jid").empty() || CONFIG_STRING(&cfg, "service.admin_password").empty()) {
+				if (CONFIG_VECTOR(&cfg, "service.admin_jid").empty() || CONFIG_STRING(&cfg, "service.admin_password").empty()) {
 					std::cerr << itr->path().string() << ": service.admin_jid or service.admin_password empty. This server can't be queried over XMPP.\n";
+				}
 				finished++;
 				Swift::Client *client = new Swift::Client(CONFIG_VECTOR(&cfg, "service.admin_jid")[0], CONFIG_STRING(&cfg, "service.admin_password"), &networkFactories);
 				client->setAlwaysTrustCertificates();

src/userregistry.cpp

➞

Show inline comments

 	m_inRemoveLater = false;
+}
 UserRegistry::~UserRegistry() { m_removeTimer->stop(); }
 void UserRegistry::isValidUserPassword(const Swift::JID& user, Swift::ServerFromClientSession *session, const Swift::SafeByteArray& password) {
 //	if (!CONFIG_STRING(config, "service.admin_jid").empty() ) {
 		std::vector<std::string> const &x = CONFIG_VECTOR(config,"service.admin_jid");
 		if (std::find(x.begin(), x.end(), user.toBare().toString()) != x.end()) {
 		    if (Swift::safeByteArrayToString(password) == CONFIG_STRING(config, "service.admin_password")) {
 			session->handlePasswordValid();
+		    }
 		    else {
 			session->handlePasswordInvalid();
+		    }
 		    return;
+	    }
 //	}
 	std::vector<std::string> const &x = CONFIG_VECTOR(config,"service.admin_jid");
 	if (std::find(x.begin(), x.end(), user.toBare().toString()) != x.end()) {
 		if (Swift::safeByteArrayToString(password) == CONFIG_STRING(config, "service.admin_password")) {
 		session->handlePasswordValid();
+		}
 		else {
 		session->handlePasswordInvalid();
+		}
 		return;
+	}
 	std::string key = user.toBare().toString();
 	// Users try to connect twice
 	if (users.find(key) != users.end()) {
 		// Kill the first session
 		LOG4CXX_INFO(logger, key << ": Removing previous session and making this one active");

0 comments (0 inline, 0 general)