X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fldapauthenticator.h;h=1b0b63948e26f2c98bab13537914e5698295d866;hp=8415496fb1de7f6373c4570000d390c55cf0bdca;hb=5fc6f7e2d63b45770574260afd6ce535e9548d23;hpb=423e088804d243368074ab218b2bda2fff3303c9

diff --git a/src/core/ldapauthenticator.h b/src/core/ldapauthenticator.h
index 8415496f..1b0b6394 100644
--- a/src/core/ldapauthenticator.h
+++ b/src/core/ldapauthenticator.h
@@ -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  *
@@ -43,7 +43,7 @@
 //#endif
 
 // Default LDAP server port.
-#define DEFAULT_LDAP_PORT 389
+constexpr int DEFAULT_LDAP_PORT = 389;
 
 class LdapAuthenticator : public Authenticator
 {
@@ -51,34 +51,36 @@ class LdapAuthenticator : public Authenticator
 
 public:
     LdapAuthenticator(QObject *parent = 0);
-    virtual ~LdapAuthenticator();
+    ~LdapAuthenticator() override;
 
 public slots:
     /* General */
-    bool isAvailable() const;
-    QString backendId() const;
-    QString displayName() const;
-    QString description() const;
-    virtual QStringList setupKeys() const;
-    virtual QVariantMap setupDefaults() const;
+    bool isAvailable() const override;
+    QString backendId() const override;
+    QString displayName() const override;
+    QString description() const override;
+    QVariantList setupData() const override;
 
-    virtual inline bool canChangePassword() const { return false; }
+    bool canChangePassword() const override { return false; }
 
-    bool setup(const QVariantMap &settings = QVariantMap());
-    State init(const QVariantMap &settings = QVariantMap());
-    UserId validateUser(const QString &user, const QString &password);
+    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:
-    virtual 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);
 
     // Protected methods for retrieving info about the LDAP connection.
-    inline virtual QString hostName() { return _hostName; }
-    inline virtual int port() { return _port; }
-    inline virtual QString bindDN() { return _bindDN; }
-    inline virtual QString baseDN() { return _baseDN; }
+    QString hostName() const { return _hostName; }
+    int port() const { return _port; }
+    QString bindDN() const { return _bindDN; }
+    QString baseDN() const { return _baseDN; }
 
 private:
     QString _hostName;
@@ -90,6 +92,5 @@ private:
     QString _uidAttribute;
 
     // The actual connection object.
-    LDAP *_connection;
-
+    LDAP *_connection {nullptr};
 };