Attachment 10305 Details for Bug 50385

[patch] patch for forward_zone.py

forward_zone.patch (text/plain), 1.52 KB, created by Christian Castens on 2020-03-09 15:38 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Castens

Created: 2020-03-09 15:38 CET

Size: 1.52 KB

patch

obsolete

>diff --git a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/forward_zone.py b/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/forward_zone.py
>index e214fc5168..4f74b31bc3 100644
>--- a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/forward_zone.py
>+++ b/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/forward_zone.py
>@@ -281,6 +281,7 @@ class object(univention.admin.handlers.simpleLdap):
> 		return univention.admin.filter.conjunction('&', [
> 			univention.admin.filter.expression('objectClass', 'dNSZone'),
> 			univention.admin.filter.expression('relativeDomainName', '@'),
>+			univention.admin.filter.expression('sOARecord', '*'),
> 			univention.admin.filter.conjunction('!', [univention.admin.filter.expression('zoneName', '*%s' % ARPA_IP4, escape=False)]),
> 			univention.admin.filter.conjunction('!', [univention.admin.filter.expression('zoneName', '*%s' % ARPA_IP6, escape=False)]),
> 		])
>@@ -291,4 +292,4 @@ lookup_filter = object.lookup_filter
> 
> 
> def identify(dn, attr, canonical=0):
>-	return 'dNSZone' in attr.get('objectClass', []) and ['@'] == attr.get('relativeDomainName', []) and not attr['zoneName'][0].endswith(ARPA_IP4) and not attr['zoneName'][0].endswith(ARPA_IP6)
>+	return 'dNSZone' in attr.get('objectClass', []) and ['@'] == attr.get('relativeDomainName', []) and 'sOARecord' in attr and not attr['zoneName'][0].endswith(ARPA_IP4) and not attr['zoneName'][0].endswith(ARPA_IP6)

Actions: View | Diff

Attachments on bug 50385: 10211 | 10212 | 10305