[Pkg-owncloud-commits] [owncloud] 12/28: correctly propagate the return value of ldap_set_option otherwise LDAP_OPT_REFERRALS won't be set to 0 and in turn active directory paging will stop working (Operations error on ldap_control_paged_result_response)

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 87a28957aadc1b1dcf5131f3421fd26886c13bfb
Author: root <leo at strike.wu.ac.at>
Date:   Fri Dec 6 12:04:17 2013 +0100

    correctly propagate the return value of ldap_set_option
    otherwise LDAP_OPT_REFERRALS won't be set to 0 and in turn
    active directory paging will stop working
    (Operations error on ldap_control_paged_result_response)
---
 apps/user_ldap/lib/ldap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/ldap.php b/apps/user_ldap/lib/ldap.php
index bc96319..dda8533 100644
--- a/apps/user_ldap/lib/ldap.php
+++ b/apps/user_ldap/lib/ldap.php
@@ -91,7 +91,7 @@ class LDAP implements ILDAPWrapper {
 	}
 
 	public function setOption($link, $option, $value) {
-		$this->invokeLDAPMethod('set_option', $link, $option, $value);
+		return $this->invokeLDAPMethod('set_option', $link, $option, $value);
 	}
 
 	public function sort($link, $result, $sortfilter) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git