diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2013-02-11 02:20:03 -0800 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2013-02-11 02:20:03 -0800 |
| commit | 764409117a88ac0e73f81ceb71f6b96b522b6225 (patch) | |
| tree | 9b1011d13f98acc6cfe397c98ef7d04173f0e181 /apps/user_ldap/lib/connection.php | |
| parent | 04146f2059e2d038177db544ea9f37a124f0781e (diff) | |
| parent | 1c94ec71eff884238e2269407cca5ee3d02f8a63 (diff) | |
| download | nextcloud-server-764409117a88ac0e73f81ceb71f6b96b522b6225.tar.gz nextcloud-server-764409117a88ac0e73f81ceb71f6b96b522b6225.zip | |
Merge pull request #1493 from owncloud/fix_ldap_stored_homedir
Fix ldap stored homedir
Diffstat (limited to 'apps/user_ldap/lib/connection.php')
| -rw-r--r-- | apps/user_ldap/lib/connection.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index f92779b1cad..933f2f42074 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -294,6 +294,11 @@ class Connection { $params = $this->getConfigTranslationArray(); foreach($config as $parameter => $value) { + if(($parameter == 'homeFolderNamingRule' + || $params[$parameter] == 'homeFolderNamingRule') + && !empty($value)) { + $value = 'attr:'.$value; + } if(isset($this->config[$parameter])) { $this->config[$parameter] = $value; if(is_array($setParameters)) { @@ -324,7 +329,7 @@ class Connection { $value = base64_encode($value); break; case 'homeFolderNamingRule': - $value = empty($value) ? 'opt:username' : 'attr:'.$value; + $value = empty($value) ? 'opt:username' : $value; break; case 'ldapBase': case 'ldapBaseUsers': |