X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreauthhandler.cpp;h=a2367c37c299357cc69f052151959261ac7a8d0c;hp=47c57965b185f5ad6488fbc3cb240f0ad19db87d;hb=16f22647e6890d3eb8c3e94f7a0700e12fa29e44;hpb=d6f3eedebc7f9619b04dffc5f48faa792950fdcd

diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index 47c57965..a2367c37 100644
--- a/src/core/coreauthhandler.cpp
+++ b/src/core/coreauthhandler.cpp
@@ -174,8 +174,7 @@ void CoreAuthHandler::handle(const RegisterClient &msg)
     QVariantList backends;
     QVariantList authenticators;
     bool configured = Core::isConfigured();
-    if (!configured)
-    {
+    if (!configured) {
         backends = Core::backendInfo();
         authenticators = Core::authenticatorInfo();
     }
@@ -184,6 +183,9 @@ void CoreAuthHandler::handle(const RegisterClient &msg)
     // XXX: FIXME: use client features here: we cannot pass authenticators if the client is too old!
     _peer->dispatch(ClientRegistered(Quassel::features(), configured, backends, useSsl, authenticators));
 
+    _peer->setBuildDate(msg.buildDate);
+    _peer->setClientVersion(msg.clientVersion);
+
     if (_legacy && useSsl)
         startSsl();
 
@@ -196,16 +198,15 @@ void CoreAuthHandler::handle(const SetupData &msg)
     if (!checkClientRegistered())
         return;
 
-    // The default parameter to authBackend is Database.
+    // The default parameter to authenticator is Database.
     // Maybe this should be hardcoded elsewhere, i.e. as a define.
-    QString authBackend = msg.authenticator;
-    quInfo() << "[" << authBackend << "]";
-    if (authBackend.trimmed().isEmpty() || authBackend == 0)
-    {
-        authBackend = QString("Database");
+    QString authenticator = msg.authenticator;
+    quInfo() << "[" << authenticator << "]";
+    if (authenticator.trimmed().isEmpty()) {
+        authenticator = QString("Database");
     }
 
-    QString result = Core::setup(msg.adminUser, msg.adminPassword, msg.backend, msg.setupData, authBackend, msg.authSetupData);
+    QString result = Core::setup(msg.adminUser, msg.adminPassword, msg.backend, msg.setupData, authenticator, msg.authSetupData);
     if (!result.isEmpty())
         _peer->dispatch(SetupFailed(result));
     else
@@ -218,12 +219,11 @@ void CoreAuthHandler::handle(const Login &msg)
     if (!checkClientRegistered())
         return;
 
-    //UserId uid = Core::validateUser(msg.user, msg.password);
-    UserId uid = Core::authenticateUser(msg.user, msg.password);
-
-    // Try doing direct database auth if the provider failed, first.
+    // First attempt local auth using the real username and password.
+    // If that fails, move onto the auth provider.
+    UserId uid = Core::validateUser(msg.user, msg.password);
     if (uid == 0) {
-        uid = Core::validateUser(msg.user, msg.password);
+        uid = Core::authenticateUser(msg.user, msg.password);
     }
 
     if (uid == 0) {