Attachment 7519 Details for Bug 40839 – patch

[patch] patch

40839.patch (text/plain), 1.89 KB, created by Florian Best on 2016-03-04 12:24:41 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2016-03-04 12:24:41 CET

Size: 1.89 KB

patch

obsolete

>diff --git a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/txt_record.py b/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/txt_record.py
>index 3484eea..cf5dc04 100644
>--- a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/txt_record.py
>+++ b/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/txt_record.py
>@@ -143,7 +143,11 @@ def lookup(co, lo, filter_s, base='', superordinate=None,scope="sub", unique=0,
> 		univention.admin.filter.expression('objectClass', 'dNSZone'),
> 		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('relativeDomainName', '@')]),
> 		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('zoneName', '*.in-addr.arpa')]),
>-		univention.admin.filter.expression('tXTRecord', '*')
>+		univention.admin.filter.expression('tXTRecord', '*'),
>+		univention.admin.filter.conjunction('|', [
>+			univention.admin.filter.expression('univentionObjectType', ''),
>+			univention.admin.filter.expression('univentionObjectType', 'dns/txt_record'),
>+		]),
> 		])
> 
> 	if superordinate:
>@@ -161,5 +165,8 @@ def lookup(co, lo, filter_s, base='', superordinate=None,scope="sub", unique=0,
> 
> def identify(dn, attr, canonical=0):
> 	univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'ALIAS(host_record) identify DN=%s'% dn)
>-	return 'dNSZone' in attr.get('objectClass', []) and '@' not in attr.get('relativeDomainName', []) and \
>-		not attr['zoneName'][0].endswith('.in-addr.arpa') and attr.get( 'tXTRecord', [] )
>+	if 'dNSZone' in attr.get('objectClass', []) and \
>+		(not attr.get('univentionObjectType') or 'dns/txt_record' in attr.get('univentionObjectType')) and \
>+		'@' not in attr.get('relativeDomainName', []) and \
>+		not attr['zoneName'][0].endswith('.in-addr.arpa'):
>+		return attr.get( 'tXTRecord', [] )

Actions: View | Diff

Attachments on bug 40839: 7519