projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ldap: Use correct authenticator name for mono client
[quassel.git]
/
src
/
core
/
core.cpp
diff --git
a/src/core/core.cpp
b/src/core/core.cpp
index
ec19aaa
..
bb1df47
100644
(file)
--- a/
src/core/core.cpp
+++ b/
src/core/core.cpp
@@
-191,7
+191,7
@@
void Core::init()
// Not entirely sure what is 'legacy' about the above, but it seems to be the way things work!
QVariantMap authSettings = cs.authSettings().toMap();
// Not entirely sure what is 'legacy' about the above, but it seems to be the way things work!
QVariantMap authSettings = cs.authSettings().toMap();
- initAuthenticator(authSettings.value("Authenticator").toString(), authSettings.value("
Connection
Properties").toMap());
+ initAuthenticator(authSettings.value("Authenticator").toString(), authSettings.value("
Auth
Properties").toMap());
if (Quassel::isOptionSet("select-backend") || Quassel::isOptionSet("select-authenticator")) {
if (Quassel::isOptionSet("select-backend")) {
if (Quassel::isOptionSet("select-backend") || Quassel::isOptionSet("select-authenticator")) {
if (Quassel::isOptionSet("select-backend")) {
@@
-347,7
+347,7
@@
QString Core::setupCoreForInternalUsage()
}
// mono client currently needs sqlite
}
// mono client currently needs sqlite
- return setupCore("AdminUser", QString::number(pass), "SQLite", QVariantMap(), "
StorageAuth
", QVariantMap());
+ return setupCore("AdminUser", QString::number(pass), "SQLite", QVariantMap(), "
Database
", QVariantMap());
}
}
@@
-1098,7
+1098,7
@@
void Core::saveAuthenticatorSettings(const QString &backend, const QVariantMap &
{
QVariantMap dbsettings;
dbsettings["Authenticator"] = backend;
{
QVariantMap dbsettings;
dbsettings["Authenticator"] = backend;
- dbsettings["
Connection
Properties"] = settings;
+ dbsettings["
Auth
Properties"] = settings;
CoreSettings().setAuthSettings(dbsettings);
}
CoreSettings().setAuthSettings(dbsettings);
}