X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreauthhandler.cpp;h=af5ef476a1f6b6433cbe9ce617c4422f77f3a1c5;hp=90f4ad84aa2d5668f8a4af4eb20c66aa395e7b94;hb=61aac1868f15babb7086d8bc6bbcff530346f438;hpb=3856cfd6126cdea97c91a22be7ded92ccc0a3577

diff --git a/src/core/coreauthhandler.cpp b/src/core/coreauthhandler.cpp
index 90f4ad84..af5ef476 100644
--- a/src/core/coreauthhandler.cpp
+++ b/src/core/coreauthhandler.cpp
@@ -172,12 +172,16 @@ void CoreAuthHandler::handle(const RegisterClient &msg)
     }
 
     QVariantList backends;
+	QVariantList authenticators;
     bool configured = Core::isConfigured();
     if (!configured)
+	{
         backends = Core::backendInfo();
+		authenticators = Core::authenticatorInfo();
+	}
 
     // useSsl is only used for the legacy protocol
-    _peer->dispatch(ClientRegistered(Quassel::features(), configured, backends, useSsl));
+    _peer->dispatch(ClientRegistered(Quassel::features(), configured, backends, authenticators, useSsl));
 
     if (_legacy && useSsl)
         startSsl();
@@ -191,7 +195,7 @@ void CoreAuthHandler::handle(const SetupData &msg)
     if (!checkClientRegistered())
         return;
 
-    QString result = Core::setup(msg.adminUser, msg.adminPassword, msg.backend, msg.setupData);
+    QString result = Core::setup(msg.adminUser, msg.adminPassword, msg.backend, msg.setupData, msg.authenticator, msg.authSetupData);
     if (!result.isEmpty())
         _peer->dispatch(SetupFailed(result));
     else
@@ -204,7 +208,14 @@ void CoreAuthHandler::handle(const Login &msg)
     if (!checkClientRegistered())
         return;
 
-    UserId uid = Core::validateUser(msg.user, msg.password);
+    //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.
+	if (uid == 0) {
+		uid = Core::validateUser(msg.user, msg.password);
+	}
+    
     if (uid == 0) {
         quInfo() << qPrintable(tr("Invalid login attempt from %1 as \"%2\"").arg(socket()->peerAddress().toString(), msg.user));
         _peer->dispatch(LoginFailed(tr("<b>Invalid username or password!</b><br>The username/password combination you supplied could not be found in the database.")));