summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-05-13 15:01:53 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-05-13 15:01:53 +0100
commit47d3624dd050c107305f778cdc91160194efbbd1 (patch)
tree180438827650d2e2556ff780b301dd39471d3272
parent8fc386d9898456d546475730bc07542c8331baa1 (diff)
downloadwebadmin-47d3624dd050c107305f778cdc91160194efbbd1.tar.gz
Use /usr/lib/mozldap/ldapsearch when no /usr/lib64/mozldap/ldapsearch exists
-rw-r--r--lib/Auth/LDAP.php8
1 files changed, 6 insertions, 2 deletions
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,