diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2012-10-01 18:27:52 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2012-10-01 18:27:58 +0200 |
| commit | 33e9399ba35b468131cfc25c62cdd961080b3c9c (patch) | |
| tree | c419b6969e810fff0b610c38d0eeeba2a2155126 /apps | |
| parent | 43c85248d4f3c922a7e5cad2b01dd32adebfac7a (diff) | |
| download | nextcloud-server-33e9399ba35b468131cfc25c62cdd961080b3c9c.tar.gz nextcloud-server-33e9399ba35b468131cfc25c62cdd961080b3c9c.zip | |
LDAP: fix sharing doesn't work with ldap groups, oc-1819
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/user_ldap/group_ldap.php | 2 | ||||
| -rw-r--r-- | apps/user_ldap/lib/access.php | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index 389679b80bd..bd9f7e0c552 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -237,7 +237,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface { } //getting dn, if false the group does not exist. If dn, it may be mapped only, requires more checking. - $dn = $this->username2dn($gid); + $dn = $this->groupname2dn($gid); if(!$dn) { $this->connection->writeToCache('groupExists'.$gid, false); return false; diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index d855ae2a163..66007d09536 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -123,7 +123,13 @@ abstract class Access { * returns the LDAP DN for the given internal ownCloud name of the group */ public function groupname2dn($name) { - return $this->ocname2dn($name, false); + $dn = $this->ocname2dn($name, false); + + if($dn) { + return $dn; + } + + return false; } /** |