X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fsqlauthenticator.cpp;h=201fd95fe4d634e29c897c2ae392b7af00d28aac;hb=f12d6496251729f7d21f4fbcb0814dec7fba4b75;hp=4977218e091408ae7b908bc0396ced836d2e362a;hpb=f77a0b720ed58a2b68876b9320742b81b6df871f;p=quassel.git

diff --git a/src/core/sqlauthenticator.cpp b/src/core/sqlauthenticator.cpp
index 4977218e..201fd95f 100644
--- a/src/core/sqlauthenticator.cpp
+++ b/src/core/sqlauthenticator.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,7 +20,7 @@
 
 #include "sqlauthenticator.h"
 
-#include "logger.h"
+#include "logmessage.h"
 #include "network.h"
 #include "quassel.h"
 
@@ -46,17 +46,23 @@ bool SqlAuthenticator::isAvailable() const
 
 QString SqlAuthenticator::backendId() const
 {
-    // We identify the backend to use for the monolithic core by its displayname.
+    // We identify the backend to use for the monolithic core by this identifier.
     // so only change this string if you _really_ have to and make sure the core
     // setup for the mono client still works ;)
     return QString("Database");
 }
 
 
+QString SqlAuthenticator::displayName() const
+{
+    return tr("Database");
+}
+
+
 QString SqlAuthenticator::description() const
 {
-    return tr("Do not auth against any remote authentication service, but instead save a hashed and salted password "
-              "in the selected database.");
+    return tr("Do not authenticate against any remote service, but instead save a hashed and salted password "
+              "in the database selected in the next step.");
 }
 
 
@@ -66,20 +72,27 @@ UserId SqlAuthenticator::validateUser(const QString &user, const QString &passwo
 }
 
 
-bool SqlAuthenticator::setup(const QVariantMap &settings)
+bool SqlAuthenticator::setup(const QVariantMap &settings, const QProcessEnvironment &environment,
+                             bool loadFromEnvironment)
 {
     Q_UNUSED(settings)
+    Q_UNUSED(environment)
+    Q_UNUSED(loadFromEnvironment)
     return true;
 }
 
 
-Authenticator::State SqlAuthenticator::init(const QVariantMap &settings)
+Authenticator::State SqlAuthenticator::init(const QVariantMap &settings,
+                                            const QProcessEnvironment &environment,
+                                            bool loadFromEnvironment)
 {
     Q_UNUSED(settings)
+    Q_UNUSED(environment)
+    Q_UNUSED(loadFromEnvironment)
 
     // TODO: FIXME: this should check if the storage provider is ready, but I don't
     // know if there's an exposed way to do that at the moment.
 
-    quInfo() << qPrintable(backendId()) << "Authenticator is ready.";
+    quInfo() << qPrintable(backendId()) << "authenticator is ready.";
     return IsReady;
 }