stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

more fixes

Browse source
This commit is contained in:
HanzZ 2012-04-09 09:27:26 +02:00
parent 10f94e5e82
commit 996a48005b
2 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
spectrum_manager/src/main.cpp
View file

@ -310,7 +310,7 @@ static void ask_local_servers(ManagerConfig *config, Swift::BoostNetworkFactorie
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";
}

23
src/userregistry.cpp
View file

@ -38,19 +38,16 @@ UserRegistry::UserRegistry(Config *cfg, Swift::NetworkFactories *factories) {
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