[Pkg-owncloud-commits] [owncloud] 247/258: Log warning when no uid was found for user

[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 b297ddf349330a174804ea3899601cbdea224d93
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Thu Oct 9 14:58:53 2014 +0200

    Log warning when no uid was found for user
    
    In some incomplete setups (like mine) it can happen that the uid
    attribute of users is missing.
    
    To be able to find out that something is wrong, a debug message is now
    logged when it has not been found.
    
    Backport of 59f9107dd9497d2eb9bd61f5eb8d893dd8fcb766 from master
---
 apps/user_ldap/group_ldap.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 0d3a705..48d097c 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -283,6 +283,10 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 			$uid = $userDN;
 		} else if(strtolower($this->access->connection->ldapGroupMemberAssocAttr) === 'memberuid') {
 			$result = $this->access->readAttribute($userDN, 'uid');
+			if ($result === false) {
+				\OCP\Util::writeLog('user_ldap', 'No uid attribute found for DN ' . $userDN . ' on '.
+					$this->access->connection->ldapHost, \OCP\Util::DEBUG);
+			}
 			$uid = $result[0];
 		} else {
 			// just in case

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