View | Details | Raw Unified | Return to bug 40839
Collapse All | Expand All

(-)a/management/univention-directory-manager-modules/modules/univention/admin/handlers/dns/txt_record.py (-3 / +10 lines)
 Lines 143-149   def lookup(co, lo, filter_s, base='', superordinate=None,scope="sub", unique=0, Link Here 
143
		univention.admin.filter.expression('objectClass', 'dNSZone'),
143
		univention.admin.filter.expression('objectClass', 'dNSZone'),
144
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('relativeDomainName', '@')]),
144
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('relativeDomainName', '@')]),
145
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('zoneName', '*.in-addr.arpa')]),
145
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('zoneName', '*.in-addr.arpa')]),
146
		univention.admin.filter.expression('tXTRecord', '*')
146
		univention.admin.filter.expression('tXTRecord', '*'),
147
		univention.admin.filter.conjunction('|', [
148
			univention.admin.filter.expression('univentionObjectType', ''),
149
			univention.admin.filter.expression('univentionObjectType', 'dns/txt_record'),
150
		]),
147
		])
151
		])
148
152
149
	if superordinate:
153
	if superordinate:
 Lines 161-165   def lookup(co, lo, filter_s, base='', superordinate=None,scope="sub", unique=0, Link Here 
161
165
162
def identify(dn, attr, canonical=0):
166
def identify(dn, attr, canonical=0):
163
	univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'ALIAS(host_record) identify DN=%s'% dn)
167
	univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'ALIAS(host_record) identify DN=%s'% dn)
164
	return 'dNSZone' in attr.get('objectClass', []) and '@' not in attr.get('relativeDomainName', []) and \
168
	if 'dNSZone' in attr.get('objectClass', []) and \
165
		not attr['zoneName'][0].endswith('.in-addr.arpa') and attr.get( 'tXTRecord', [] )
169
		(not attr.get('univentionObjectType') or 'dns/txt_record' in attr.get('univentionObjectType')) and \
170
		'@' not in attr.get('relativeDomainName', []) and \
171
		not attr['zoneName'][0].endswith('.in-addr.arpa'):
172
		return attr.get( 'tXTRecord', [] )

Return to bug 40839