From 680b189709a9f23e059ee93d89edf7d98692a55f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 9 Sep 2015 14:01:17 -0700
Subject: [PATCH] Fixes #1151 - additional LDAP option

---
 app/config/version.php             | 4 ++--
 app/controllers/AuthController.php | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index 2871a85621fd..b2aaf4961c4c 100644
--- 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',
 );
\ No newline at end of file
diff --git a/app/controllers/AuthController.php b/app/controllers/AuthController.php
index 3141fcbd5dbe..c4a300e77096 100755
--- 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) {