diff --git a/app/config/local/ldap.example.php b/app/config/local/ldap.example.php index 6c5ff3f77b..9bce1d7234 100644 --- a/app/config/local/ldap.example.php +++ b/app/config/local/ldap.example.php @@ -91,5 +91,17 @@ return array( | The LDAP query that we want to execute when authenticating a user | */ - 'authentication.filter.query' => "uid=" + 'authentication.filter.query' => "uid=", + + /* + |-------------------------------------------------------------------------- + | LDAP Version + |-------------------------------------------------------------------------- + | + | The LDAP query that we want to execute when authenticating a user + | + */ + 'version' => 3, + + ); diff --git a/app/config/production/ldap.example.php b/app/config/production/ldap.example.php index 5442823891..9bce1d7234 100644 --- a/app/config/production/ldap.example.php +++ b/app/config/production/ldap.example.php @@ -22,7 +22,7 @@ return array( | */ 'username' => "", - + /* |-------------------------------------------------------------------------- | Password @@ -32,7 +32,7 @@ return array( | */ 'password' => "", - + /* |-------------------------------------------------------------------------- | Basedn @@ -42,7 +42,7 @@ return array( | */ 'basedn' => "", - + /* |-------------------------------------------------------------------------- @@ -54,11 +54,11 @@ return array( */ 'filter' => "", - + /* |-------------------------------------------------------------------------- | LDAP field names that will be retrieved to create a user. - | + | | Using the username as an example: | If I set 'result.username' => 'my-org-username', the code will connect to | LDAP as follows (where $results[$i] represents a row in the LDAP query: @@ -69,20 +69,20 @@ return array( | | The search filter for the LDAP query. | - */ + */ 'result.username' => "", 'result.emp.num' => "", 'result.last.name' => "", 'result.first.name' => "", 'result.email' => "", - + /* | This field is optional as not all LDAP directories will have it. If yours | does not have it, just leave this field blank and the extra check will | be omitted. */ 'result.active.flag' => "", - + /* |-------------------------------------------------------------------------- | LDAP filter query for authentication @@ -91,5 +91,17 @@ return array( | The LDAP query that we want to execute when authenticating a user | */ - 'authentication.filter.query' => "uid=" + 'authentication.filter.query' => "uid=", + + /* + |-------------------------------------------------------------------------- + | LDAP Version + |-------------------------------------------------------------------------- + | + | The LDAP query that we want to execute when authenticating a user + | + */ + 'version' => 3, + + ); diff --git a/app/config/staging/ldap.example.php b/app/config/staging/ldap.example.php index 6c5ff3f77b..9bce1d7234 100644 --- a/app/config/staging/ldap.example.php +++ b/app/config/staging/ldap.example.php @@ -91,5 +91,17 @@ return array( | The LDAP query that we want to execute when authenticating a user | */ - 'authentication.filter.query' => "uid=" + 'authentication.filter.query' => "uid=", + + /* + |-------------------------------------------------------------------------- + | LDAP Version + |-------------------------------------------------------------------------- + | + | The LDAP query that we want to execute when authenticating a user + | + */ + 'version' => 3, + + ); diff --git a/app/config/testing/ldap.example.php b/app/config/testing/ldap.example.php index 071561b9ae..fafbe515c0 100644 --- a/app/config/testing/ldap.example.php +++ b/app/config/testing/ldap.example.php @@ -22,7 +22,7 @@ return array( | */ 'username' => "", - + /* |-------------------------------------------------------------------------- | Password @@ -32,7 +32,7 @@ return array( | */ 'password' => "", - + /* |-------------------------------------------------------------------------- | Basedn @@ -42,7 +42,7 @@ return array( | */ 'basedn' => "", - + /* |-------------------------------------------------------------------------- @@ -54,11 +54,11 @@ return array( */ 'filter' => "", - + /* |-------------------------------------------------------------------------- | LDAP field names that will be retrieved to create a user. - | + | | Using the username as an example: | If I set 'result.username' => 'my-org-username', the code will connect to | LDAP as follows (where $results[$i] represents a row in the LDAP query: @@ -69,14 +69,20 @@ return array( | | The search filter for the LDAP query. | - */ + */ 'result.username' => "", 'result.emp.num' => "", 'result.last.name' => "", 'result.first.name' => "", 'result.email' => "", + + /* + | This field is optional as not all LDAP directories will have it. If yours + | does not have it, just leave this field blank and the extra check will + | be omitted. + */ 'result.active.flag' => "", - + /* |-------------------------------------------------------------------------- | LDAP filter query for authentication @@ -85,5 +91,17 @@ return array( | The LDAP query that we want to execute when authenticating a user | */ - 'authentication.filter.query' => "uid=" + 'authentication.filter.query' => "uid=", + + /* + |-------------------------------------------------------------------------- + | LDAP Version + |-------------------------------------------------------------------------- + | + | The LDAP query that we want to execute when authenticating a user + | + */ + 'ldap_version' => 3, + + ); diff --git a/app/config/version.php b/app/config/version.php index 7b077a1cf6..5c39538070 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.0-pre', - 'hash_version' => 'v2.0-pre-beta-384-ge7d7cc6', + 'hash_version' => 'v2.0-pre-beta-390-gdb8ea88', ); \ No newline at end of file