From 4f75a9cf1ccb9b4c6e196e6f5174d39450aeb00a Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 21 Jun 2013 23:58:27 +0200 Subject: [PATCH] Revert "LDAP: better check for emptiness, fixes #3815" This reverts commit 4797f9d7db8b48c977e34303a9c80eaea704af19. --- apps/user_ldap/lib/connection.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index cf39329f150..46bbbb17a46 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -421,21 +421,11 @@ class Connection { private function validateConfiguration() { // first step: "soft" checks: settings that are not really // necessary, but advisable. If left empty, give an info message - if(empty($this->config['ldapBaseUsers']) || - // this part handles return of preg_split in readConfiguration - (count($this->config['ldapBaseUsers'][0]) === 1 - && isset($this->config['ldapBaseUsers'][0]) - && empty($this->config['ldapBaseUsers'][0])) - ) { + if(empty($this->config['ldapBaseUsers'])) { \OCP\Util::writeLog('user_ldap', 'Base tree for Users is empty, using Base DN', \OCP\Util::INFO); $this->config['ldapBaseUsers'] = $this->config['ldapBase']; } - if(empty($this->config['ldapBaseGroups']) || - // this part handles return of preg_split in readConfiguration - (count($this->config['ldapBaseGroups'][0]) === 1 - && isset($this->config['ldapBaseGroups'][0]) - && empty($this->config['ldapBaseGroups'][0])) - ) { + if(empty($this->config['ldapBaseGroups'])) { \OCP\Util::writeLog('user_ldap', 'Base tree for Groups is empty, using Base DN', \OCP\Util::INFO); $this->config['ldapBaseGroups'] = $this->config['ldapBase']; } -- 2.39.5