diff --git a/contrib_modules/ldap/ldap.html b/contrib_modules/ldap/ldap.html index 17d4582..1ad1599 100644 --- a/contrib_modules/ldap/ldap.html +++ b/contrib_modules/ldap/ldap.html @@ -167,11 +167,11 @@

* Default: FALSE * Required: No */ - 'ldap.debug' => false, + 'debug' => false, /** * The LDAP-options to pass when setting up a connection - * See [Symfony documentation][1] + * See [Symfony documentation] */ 'options' => [ /** @@ -254,8 +254,8 @@

* Additional filters that must match for the entire LDAP search to * be true. * - * This should be a single string conforming to [RFC 1960][2] - * and [RFC 2544][3]. The string is appended to the search attributes + * This should be a single string conforming to [RFC 1960] + * and [RFC 2544]. The string is appended to the search attributes */ 'search.filter' => '(&(objectClass=Person)(|(sn=Doe)(cn=John *)))', @@ -269,6 +269,20 @@

], +

+ See: +

+

+ + Symfony documentation + + + RFC 1960 + + + RFC 2544 + +

You should update the name of this authentication source ( @@ -644,12 +658,12 @@ 

    50 => [
         'class' => 'ldap:AttributeAddFromLDAP',
-        'ldap.hostname' => 'ldap.example.org',
-        'ldap.username' => 'CN=LDAP User,CN=Users,DC=example,DC=org',
-        'ldap.password' => 'Abc123',
-        'ldap.basedn' => ['DC=example,DC=org'],
-        'attributes' => ['displayName' => 'cn', 'jpegPhoto'],
+        'connection_string' => 'ldap.example.org',
+        'search.username' => 'CN=LDAP User,CN=Users,DC=example,DC=org',
+        'search.password' => 'Abc123',
+        'search.base' => ['DC=example,DC=org'],
         'search.filter' => '(uid=%uid%)',
+        'attributes' => ['displayName' => 'cn', 'jpegPhoto'],
     ]
@@ -707,7 +721,7 @@

* Required: No * AuthSource: search.base */ - 'ldap.basedn' => [ + 'search.base' => [ 'OU=Staff,DC=example,DC=org', 'OU=Students,DC=example,DC=org' ], @@ -721,22 +735,16 @@

* Required: No * AuthSource: debug */ - 'ldap.debug' => false, - 'ldap.debug' => true, + 'debug' => false, + 'debug' => true, /** - * Set to TRUE to force the LDAP connection to use TLS. - * - * Note: If ldaps:// is specified in the hostname then it - * will automatically use TLS. - * - * Default: FALSE - * Required: No - * AuthSource: enable_tls + * Whether SSL/TLS should be used when contacting the LDAP server. + * Possible values are 'ssl', 'tls' or 'none' */ - 'ldap.enable_tls' => false, - 'ldap.enable_tls' => true, + 'encryption' => 'tls', + 'encryption' => 'ssl', /** @@ -750,19 +758,8 @@

* Required: Yes, unless authsource is used * AuthSource: hostname */ - 'ldap.hostname' => 'ldap.example.org', - 'ldap.hostname' => 'ad1.example.org ad2.example.org', - - - /** - * This is the port where the LDAP server(s) listen for - * connections. - * - * Default: 389 - * Required: No - * AuthSource: port - */ - 'ldap.port' => 389, + 'connection_string' => 'ldap.example.org', + 'connection_string' => 'ad1.example.org ad2.example.org', /** @@ -772,7 +769,7 @@

* Required: No, only if required for binding. * AuthSource: search.password OR priv.password */ - 'ldap.password' => 'Abc123', + 'search.password' => 'Abc123', /** @@ -799,8 +796,8 @@

* Required: No * AuthSource: timeout */ - 'ldap.timeout' => 0, - 'ldap.timeout' => 30, + 'timeout' => 0, + 'timeout' => 30, /** @@ -812,7 +809,7 @@

* Required: No, only if required for binding. * AuthSource: search.username OR priv.username */ - 'ldap.username' => 'CN=LDAP User,CN=Users,DC=example,DC=org', + 'search.username' => 'CN=LDAP User,CN=Users,DC=example,DC=org', /** @@ -892,10 +889,10 @@ 

    50 => [
         'class' => 'ldap:AttributeAddUsersGroups',
-        'ldap.hostname' => 'ldap.example.org',
-        'ldap.username' => 'CN=LDAP User,CN=Users,DC=example,DC=org',
-        'ldap.password' => 'Abc123',
-        'ldap.basedn' => ['DC=example,DC=org'],
+        'connection_string' => 'ldaps://ldap.example.org',
+        'search.username' => 'CN=LDAP User,CN=Users,DC=example,DC=org',
+        'search.password' => 'Abc123',
+        'search.base' => ['DC=example,DC=org'],
     ]
@@ -919,7 +916,7 @@ 

    50 => [
         'class' => 'ldap:AttributeAddUsersGroups',
         'ldap.product' => 'OpenLDAP',
-        'ldap.basedn' => ['ou=groups,dc=example,dc=org'],
+        'search.base' => ['ou=groups,dc=example,dc=org'],
         'attribute.username' => 'uid',
         'attribute.member' => 'cn',
         'attribute.memberOf' => 'memberUid',