X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fsqlauthenticator.cpp;h=969f2d02b77370aa88b20c31c619cdc2d64fff23;hb=8f2ee00f4edef1693628d3af0bdee84d725eb754;hp=3be817b99056a0107ad3f1717fe22ff20e43a913;hpb=423e088804d243368074ab218b2bda2fff3303c9;p=quassel.git

diff --git a/src/core/sqlauthenticator.cpp b/src/core/sqlauthenticator.cpp
index 3be817b9..969f2d02 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"
 
@@ -32,11 +32,6 @@ SqlAuthenticator::SqlAuthenticator(QObject *parent)
 }
 
 
-SqlAuthenticator::~SqlAuthenticator()
-{
-}
-
-
 bool SqlAuthenticator::isAvailable() const
 {
     // FIXME: probably this should query the current storage (see the ::init routine too).
@@ -61,8 +56,8 @@ QString SqlAuthenticator::displayName() const
 
 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.");
 }
 
 
@@ -72,20 +67,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;
 }