summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorTimotheus Pokorra <tp@tbits.net>2015-06-12 18:47:58 +0200
committerTimotheus Pokorra <tp@tbits.net>2015-06-12 18:47:58 +0200
commit6f9f8d3c1bd1fb2f22d0457e378b033c95104fe2 (patch)
treeb9ea27e80894b5f62c10acea93424fe05be2b5aa /bin
parent0e4caf1c383b47cab33a8dba03c34a6c3fbef288 (diff)
downloadwebadmin-6f9f8d3c1bd1fb2f22d0457e378b033c95104fe2.tar.gz
domain_delete.php: fix deleting the domain avoiding ldap error (#5100)
the ldap error was: ldap_delete: Operation not allowed on non-leaf on cn=kolab-admin,dc=yourdomain,dc=org
Diffstat (limited to 'bin')
-rw-r--r--bin/domain_delete.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/domain_delete.php b/bin/domain_delete.php
index 4dbe729..8c30dfd 100644
--- a/bin/domain_delete.php
+++ b/bin/domain_delete.php
@@ -112,6 +112,12 @@ function delete_domain($domain_dn, $domain)
}
$entries = array();
+
+ // for unknown reasons, this will not be deleted recursively when deleting the domain.
+ // resulting in "Operation not allowed on non-leaf"
+ // so we specifically delete the leaf here
+ $entries[] = "cn=kolab-admin,".$inetdomainbasedn;
+
$entries[] = $inetdomainbasedn;
$cn = str_replace('.', '_', $domain_name);