Merge branch 'master' into ldap-username-field

2017-12-12 10:27:22 +01:00
parent 612b2d1811 74758723f9
commit 17e3b8b5cd
4 changed files with 15 additions and 8 deletions
--- a/config.json.example
+++ b/config.json.example
@@ -70,7 +70,7 @@
            "tokenSecret": "change this",
            "searchBase": "change this",
            "searchFilter": "change this",
-            "searchAttributes": "change this",
+            "searchAttributes": ["change this"],
            "usernameField": "change this e.g. uid"
            "tlsOptions": {
                "changeme": "See https://nodejs.org/api/tls.html#tls_tls_connect_options_callback"