From 7c693d917bda0b49a75d5f49a80e698ff0a9e2cb Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Mon, 23 Mar 2009 10:25:52 +0000 Subject: [PATCH] Creation of the manager account should not happen if there is one already. --- .../Kolab_Server/lib/Horde/Kolab/Server/test.php | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php index 44843c419..86cb55f9f 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php @@ -106,17 +106,19 @@ class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap && isset($this->params['adminpass'])) { $base_dn = isset($this->params['basedn']) ? ',' . $this->params['basedn'] : ''; $dn = 'cn=' . $this->params['adminuser'] . ',cn=internal' . $base_dn; - $ldap_data = array( - 'cn' => array('manager'), - 'sn' => array('n/a'), - 'uid' => array('manager'), - 'userPassword' => array($this->params['adminpass']), - 'objectClass' => array('top','inetOrgPerson','kolabInetOrgPerson') - ); - $this->data[$dn] = array( - 'dn' => $dn, - 'data' => $ldap_data - ); + if (!isset($this->data[$dn])) { + $ldap_data = array( + 'cn' => array('manager'), + 'sn' => array('n/a'), + 'uid' => array('manager'), + 'userPassword' => array($this->params['adminpass']), + 'objectClass' => array('top','inetOrgPerson','kolabInetOrgPerson') + ); + $this->data[$dn] = array( + 'dn' => $dn, + 'data' => $ldap_data + ); + } } $this->store(); -- 2.11.0