diff options
author | Andreas Gohr <andi@splitbrain.org> | 2013-06-07 13:23:40 +0200 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2013-06-08 13:14:04 +0200 |
commit | 38e9cd540d5a86ac276fa3d0d98ee0cf50482746 (patch) | |
tree | 8e6a7e6629d1593397cc4d38aaa63dc067fae7cc /lib/plugins/authldap/auth.php | |
parent | 4a4e41d90e140973eb270bf1bd883e56f3a6b87b (diff) | |
download | rpg-38e9cd540d5a86ac276fa3d0d98ee0cf50482746.tar.gz rpg-38e9cd540d5a86ac276fa3d0d98ee0cf50482746.tar.bz2 |
fix ldap deref option FS2798
Do not pass timelimit and deref settings to ldap_search. These values
should be set globally via ldap_set_option() instead (as we do for
deref).
Diffstat (limited to 'lib/plugins/authldap/auth.php')
-rw-r--r-- | lib/plugins/authldap/auth.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/plugins/authldap/auth.php b/lib/plugins/authldap/auth.php index b49aa4792..e43c3f828 100644 --- a/lib/plugins/authldap/auth.php +++ b/lib/plugins/authldap/auth.php @@ -502,23 +502,23 @@ class auth_plugin_authldap extends DokuWiki_Auth_Plugin { * @return resource */ protected function _ldapsearch($link_identifier, $base_dn, $filter, $scope = 'sub', $attributes = null, - $attrsonly = 0, $sizelimit = 0, $timelimit = 0, $deref = LDAP_DEREF_NEVER) { + $attrsonly = 0, $sizelimit = 0) { if(is_null($attributes)) $attributes = array(); if($scope == 'base') { return @ldap_read( $link_identifier, $base_dn, $filter, $attributes, - $attrsonly, $sizelimit, $timelimit, $deref + $attrsonly, $sizelimit ); } elseif($scope == 'one') { return @ldap_list( $link_identifier, $base_dn, $filter, $attributes, - $attrsonly, $sizelimit, $timelimit, $deref + $attrsonly, $sizelimit ); } else { return @ldap_search( $link_identifier, $base_dn, $filter, $attributes, - $attrsonly, $sizelimit, $timelimit, $deref + $attrsonly, $sizelimit ); } } |