From 5e75009b646c3bf9685a4361ee1fb8ae078d1fc4 Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Tue, 27 Nov 2012 17:02:25 -0400
Subject: [PATCH] BUG 9894 Active Directory User Import not working IMPROVEMENT

---
 rbac/engine/classes/plugins/class.ldap.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rbac/engine/classes/plugins/class.ldap.php b/rbac/engine/classes/plugins/class.ldap.php
index 55c6357a7..42d6d50a9 100755
--- a/rbac/engine/classes/plugins/class.ldap.php
+++ b/rbac/engine/classes/plugins/class.ldap.php
@@ -147,13 +147,16 @@ class LDAP
         $sKeyword .= '*';
       }
     }
+
+    $additionalFilter = isset($aAuthSource['AUTH_SOURCE_DATA']['AUTH_SOURCE_ADDITIONAL_FILTER']) ? trim($aAuthSource['AUTH_SOURCE_DATA']['AUTH_SOURCE_ADDITIONAL_FILTER']) : '';
+
     $sFilter  = '(&(|(objectClass=*))';
 
     if ( isset( $aAuthSource['AUTH_SOURCE_DATA']['LDAP_TYPE']) && $aAuthSource['AUTH_SOURCE_DATA']['LDAP_TYPE'] == 'ad' ) {
-      $sFilter = "(&(|(objectClass=*))(|(samaccountname=$sKeyword)(userprincipalname=$sKeyword)))";
+      $sFilter = "(&(|(objectClass=*))(|(samaccountname=$sKeyword)(userprincipalname=$sKeyword))$additionalFilter)";
     }
     else
-      $sFilter = "(&(|(objectClass=*))(|(uid=$sKeyword)(cn=$sKeyword)))";
+      $sFilter = "(&(|(objectClass=*))(|(uid=$sKeyword)(cn=$sKeyword))$additionalFilter)";
 
     //G::pr($sFilter);
     $aUsers  = array();