Fixes #1151 - additional LDAP option

snipe · Sep 9, 2015 · 680b189 · 680b189
1 parent 29d5682
commit 680b189
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/config/version.php b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v2.0-89',
-  'hash_version' => 'v2.0-89-gd1fc48d',
+  'app_version' => 'v2.0-90',
+  'hash_version' => 'v2.0-90-g32604f0',
 );
diff --git a/app/controllers/AuthController.php b/app/controllers/AuthController.php
@@ -33,11 +33,13 @@ function ldap($username, $password) {
         $ldappass    = Config::get('ldap.password');
         $baseDn      = Config::get('ldap.basedn');
         $filterQuery = Config::get('ldap.authentication.filter.query') . $username;
+        $ldapversion = Config::get('ldap.version');
 
 	// Connecting to LDAP
 	$connection = ldap_connect($ldaphost) or die("Could not connect to {$ldaphost}");
     // Needed for AD
     ldap_set_option($connection, LDAP_OPT_REFERRALS, 0);
+    ldap_set_option($connection, LDAP_OPT_PROTOCOL_VERSION,$ldapversion);
 
         try {
             if ($connection) {