tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow LDAP queries without objectClass filter

Browse Source
This commit is contained in:
Thomas Gelf 2014-03-21 10:31:12 +00:00
parent f24e5eaa8a
commit fea7e8993b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/Icinga/Protocol/Ldap/Query.php
View File

@ -313,8 +313,8 @@ class Query
protected function render() protected function render()
{ {
$parts = array(); $parts = array();
if ($this->filters['objectClass'] === null) { if (! isset($this->filters['objectClass']) || $this->filters['objectClass'] === null) {
throw new Exception('Object class is mandatory'); // throw new Exception('Object class is mandatory');
} }
foreach ($this->filters as $key => $value) { foreach ($this->filters as $key => $value) {
$parts[] = sprintf( $parts[] = sprintf(
@ -323,7 +323,11 @@ class Query
LdapUtils::quoteForSearch($value, true) LdapUtils::quoteForSearch($value, true)
); );
} }
return '(&(' . implode(')(', $parts) . '))'; if (count($parts) > 1) {
return '(&(' . implode(')(', $parts) . '))';
} else {
return '(' . $parts[0] . ')';
}
} }
/** /**