diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-07-20 11:24:28 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-07-29 20:25:05 +0200 |
| commit | 0e922b1841ff85e9557ee61a85112f169caa7694 (patch) | |
| tree | 0ba8930cc48491d0ac1deb4cca98653744d4e6d6 /apps/user_ldap/user_ldap.php | |
| parent | 3fa6f6f77c3045feffc16f33ad4014868b88de0c (diff) | |
| download | nextcloud-server-0e922b1841ff85e9557ee61a85112f169caa7694.tar.gz nextcloud-server-0e922b1841ff85e9557ee61a85112f169caa7694.zip | |
Only throw exception if on new LDAP setups
* this is done by setting enforce_home_folder_naming_rule for the user_ldap
app in the app settings
Diffstat (limited to 'apps/user_ldap/user_ldap.php')
| -rw-r--r-- | apps/user_ldap/user_ldap.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index c4ebace8558..a2f4b4ee9e5 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -294,8 +294,10 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn //TODO: if home directory changes, the old one needs to be removed. return $homedir; } - // a naming rule attribute is defined, but it doesn't exist for that LDAP user - throw new \Exception('Home dir attribute can\'t be read from LDAP for uid: ' . $uid); + if($this->ocConfig->getAppValue('user_ldap', 'enforce_home_folder_naming_rule', true)) { + // a naming rule attribute is defined, but it doesn't exist for that LDAP user + throw new \Exception('Home dir attribute can\'t be read from LDAP for uid: ' . $uid); + } } //false will apply default behaviour as defined and done by OC_User |