diff options
| author | blizzz <blizzz@owncloud.com> | 2013-01-15 04:01:57 -0800 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2013-01-15 04:01:57 -0800 |
| commit | bb9cc227c2583adc6b51a1f6d75a9fc8333836b9 (patch) | |
| tree | e973338ed7b4b99da4d20534bd374f25c9305097 /apps/user_ldap/lib/connection.php | |
| parent | fdd667a83c5cc9938cdfc4a2a5660de1c0a7aa0c (diff) | |
| parent | 4a8c25eef508342fe919823b575b2de02072a379 (diff) | |
| download | nextcloud-server-bb9cc227c2583adc6b51a1f6d75a9fc8333836b9.tar.gz nextcloud-server-bb9cc227c2583adc6b51a1f6d75a9fc8333836b9.zip | |
Merge pull request #1087 from owncloud/ldap_multiple_dns
LDAP: ability to configure more than one base DN
Diffstat (limited to 'apps/user_ldap/lib/connection.php')
| -rw-r--r-- | apps/user_ldap/lib/connection.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index b14cdafff89..7046cbbfc78 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -187,9 +187,9 @@ class Connection { $this->config['ldapPort'] = \OCP\Config::getAppValue($this->configID, 'ldap_port', 389); $this->config['ldapAgentName'] = \OCP\Config::getAppValue($this->configID, 'ldap_dn', ''); $this->config['ldapAgentPassword'] = base64_decode(\OCP\Config::getAppValue($this->configID, 'ldap_agent_password', '')); - $this->config['ldapBase'] = \OCP\Config::getAppValue($this->configID, 'ldap_base', ''); - $this->config['ldapBaseUsers'] = \OCP\Config::getAppValue($this->configID, 'ldap_base_users', $this->config['ldapBase']); - $this->config['ldapBaseGroups'] = \OCP\Config::getAppValue($this->configID, 'ldap_base_groups', $this->config['ldapBase']); + $this->config['ldapBase'] = preg_split('/\r\n|\r|\n/', \OCP\Config::getAppValue($this->configID, 'ldap_base', '')); + $this->config['ldapBaseUsers'] = preg_split('/\r\n|\r|\n/', \OCP\Config::getAppValue($this->configID, 'ldap_base_users', $this->config['ldapBase'])); + $this->config['ldapBaseGroups'] = preg_split('/\r\n|\r|\n/', \OCP\Config::getAppValue($this->configID, 'ldap_base_groups', $this->config['ldapBase'])); $this->config['ldapTLS'] = \OCP\Config::getAppValue($this->configID, 'ldap_tls', 0); $this->config['ldapNoCase'] = \OCP\Config::getAppValue($this->configID, 'ldap_nocase', 0); $this->config['turnOffCertCheck'] = \OCP\Config::getAppValue($this->configID, 'ldap_turn_off_cert_check', 0); |