X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fldapauthenticator.h;h=81847380c1f3d76d11ec2897993027a18e3f26bf;hb=b8db3c55a7f66a8d6ecabf9039aabceff9ae4837;hp=1bff10fa9ffd1f3606c0d4d4be19c0bb78a9640c;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf;p=quassel.git

diff --git a/src/core/ldapauthenticator.h b/src/core/ldapauthenticator.h
index 1bff10fa..81847380 100644
--- a/src/core/ldapauthenticator.h
+++ b/src/core/ldapauthenticator.h
@@ -29,7 +29,6 @@
 #pragma once
 
 #include "authenticator.h"
-
 #include "core.h"
 
 // Link against LDAP.
@@ -50,7 +49,7 @@ class LdapAuthenticator : public Authenticator
     Q_OBJECT
 
 public:
-    LdapAuthenticator(QObject *parent = 0);
+    LdapAuthenticator(QObject* parent = nullptr);
     ~LdapAuthenticator() override;
 
 public slots:
@@ -63,15 +62,15 @@ public slots:
 
     bool canChangePassword() const override { return false; }
 
-    bool setup(const QVariantMap &settings = {}) override;
-    State init(const QVariantMap &settings = {}) override;
-    UserId validateUser(const QString &user, const QString &password) override;
+    bool setup(const QVariantMap& settings, const QProcessEnvironment& environment, bool loadFromEnvironment) override;
+    State init(const QVariantMap& settings, const QProcessEnvironment& environment, bool loadFromEnvironment) override;
+    UserId validateUser(const QString& user, const QString& password) override;
 
 protected:
-    void setAuthProperties(const QVariantMap &properties);
+    void setAuthProperties(const QVariantMap& properties, const QProcessEnvironment& environment, bool loadFromEnvironment);
     bool ldapConnect();
     void ldapDisconnect();
-    bool ldapAuth(const QString &username, const QString &password);
+    bool ldapAuth(const QString& username, const QString& password);
 
     // Protected methods for retrieving info about the LDAP connection.
     QString hostName() const { return _hostName; }
@@ -89,5 +88,5 @@ private:
     QString _uidAttribute;
 
     // The actual connection object.
-    LDAP *_connection {nullptr};
+    LDAP* _connection{nullptr};
 };