Attachment 9590 Details for Bug 47343

[patch] check_and_show_child_objects_before_zone_removal_fails.patch

check_and_show_child_objects_before_zone_removal_fails.patch (text/plain), 994 bytes, created by Arvid Requate on 2018-07-11 14:41 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2018-07-11 14:41 CEST

Size: 994 bytes

patch

obsolete

>diff --git a/services/univention-s4-connector/modules/univention/s4connector/s4/dns.py b/services/univention-s4-connector/modules/univention/s4connector/s4/dns.py
>index 39d1d07995..9bd3844020 100644
>--- a/services/univention-s4-connector/modules/univention/s4connector/s4/dns.py
>+++ b/services/univention-s4-connector/modules/univention/s4connector/s4/dns.py
>@@ -875,6 +875,16 @@ def s4_zone_delete(s4connector, object):
> 	soa_dn = object['dn']
> 	zone_dn = s4connector.lo.parentDn(soa_dn)
> 
>+	records = []
>+	for result in self.lo_s4.lo.search_ext_s(zone_dn), ldap.SCOPE_SUBTREE, 'objectClass=*', timeout=-1, sizelimit=0):
>+		if result[0] != zone_dn and result[0] != soa_dn:
>+			records.append(result[0])
>+	if records:
>+		ud.debug(ud.LDAP, ud.ERROR, "remove zone container from S4 failed, there are sub-objects left")
>+		for record in records:
>+			ud.debug(ud.LDAP, ud.ERROR, "\t%s" % record)
>+		return False
>+
> 	try:
> 		res = s4connector.lo_s4.lo.delete_s(soa_dn)
> 	except ldap.NO_SUCH_OBJECT:

Actions: View | Diff

Attachments on bug 47343: 9590