summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2015-02-24 09:26:40 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2015-02-24 09:26:40 (GMT)
commit186b12cac94af8b805b52dbaedee0a14a2b11158 (patch)
tree0892563d92893023b4dd79a098cfb1574ba032e3
parentb19bca278af8c73b48f8687cb85fa6ab74730b07 (diff)
parent7e6148385886be88e891e192d7d1703960a9785e (diff)
downloadNet_LDAP3-186b12cac94af8b805b52dbaedee0a14a2b11158.tar.gz
Merge branch 'master' of ssh://git.kolabsys.com/git/pear/Net_LDAP3
-rw-r--r--composer.json2
-rw-r--r--lib/Net/LDAP3.php10
2 files changed, 8 insertions, 4 deletions
diff --git a/composer.json b/composer.json
index 8228224..f631e70 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"name": "kolab/Net_LDAP3",
"description": "A successor of the PEAR:Net_LDAP2 module providing advanced functionality for accessing LDAP directories",
"type": "library",
- "version": "1.0.1",
+ "version": "1.0.2",
"keywords": ["pear", "ldap", "vlv"],
"homepage": "http://git.kolab.org/pear/Net_LDAP3/",
"license": "GPL-3.0",
diff --git a/lib/Net/LDAP3.php b/lib/Net/LDAP3.php
index 0ff28e4..78d497d 100644
--- a/lib/Net/LDAP3.php
+++ b/lib/Net/LDAP3.php
@@ -779,7 +779,7 @@ class Net_LDAP3
// remove password from debug log
$command_debug = $command;
- $command_debug[11] = '*';
+ $command_debug[13] = '*';
$command = implode(' ', $command);
$command_debug = implode(' ', $command_debug);
@@ -1552,12 +1552,16 @@ class Net_LDAP3
return false;
}
- $this->_debug("C: Search base dn: [$base_dn] scope [$scope] with filter [$filter]");
-
// make sure attributes list is not empty
if (empty($attrs)) {
$attrs = array('dn');
}
+ // make sure filter is not empty
+ if (empty($filter)) {
+ $filter = '(objectclass=*)';
+ }
+
+ $this->_debug("C: Search base dn: [$base_dn] scope [$scope] with filter [$filter]");
$function = self::scope_to_function($scope, $ns_function);