lib/Auth

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Sun May 13 16:04:22 CEST 2012


 lib/Auth/LDAP.php |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 5dc40e6e135f4cecab9a4816aa597968f99dff4b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun May 13 15:01:53 2012 +0100

    Use /usr/lib/mozldap/ldapsearch when no /usr/lib64/mozldap/ldapsearch exists

diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index 52ea985..a788c09 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -333,9 +333,13 @@ class LDAP
 
         //console("effective_rights for $subject resolves to $entry_dn");
 
+        $moz_ldapsearch = "/usr/lib64/mozldap/ldapsearch";
+        if (!is_file($moz_ldapsearch)) {
+            $moz_ldapsearch = "/usr/lib/mozldap/ldapsearch";
+        }
+
         $command = array(
-                // TODO: Very 64-bit specific
-                '/usr/lib64/mozldap/ldapsearch',
+                $moz_ldapsearch,
                 '-x',
                 '-h',
                 $this->_ldap_server,





More information about the commits mailing list