Attachment #7082 for bug #39077

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




				if not dnsRecords:
					return None

				dns_types=set()
				for dnsRecord in dnsRecords:
					dnsRecord=dnsRecord.encode('latin1')
					dnsRecord_DnssrvRpcRecord=ndr_unpack(dnsp.DnssrvRpcRecord, dnsRecord)
					dns_types.add(dnsRecord_DnssrvRpcRecord.wType)

				if dnsp.DNS_TYPE_PTR in dns_types:
					return 'ptr_record'

					return 'alias'
				elif dnsp.DNS_TYPE_SRV in dns_types:
					return 'srv_record'
				elif set((dnsp.DNS_TYPE_A, dnsp.DNS_TYPE_AAAA)) & dns_types:
					return 'host_record'
				
	return None

Return to bug 39077

Lines 1146-1156 Link Here

(-)modules/univention/s4connector/s4/dns.py (-3 / +3 lines)
1146	if not dnsRecords:	1146	if not dnsRecords:
1147	return None	1147	return None
1148		1148
1149	dns_types=[]	1149	dns_types=set()
1150	for dnsRecord in dnsRecords:	1150	for dnsRecord in dnsRecords:
1151	dnsRecord=dnsRecord.encode('latin1')	1151	dnsRecord=dnsRecord.encode('latin1')
1152	dnsRecord_DnssrvRpcRecord=ndr_unpack(dnsp.DnssrvRpcRecord, dnsRecord)	1152	dnsRecord_DnssrvRpcRecord=ndr_unpack(dnsp.DnssrvRpcRecord, dnsRecord)
1153	dns_types.append(dnsRecord_DnssrvRpcRecord.wType)	1153	dns_types.add(dnsRecord_DnssrvRpcRecord.wType)
1154		1154
1155	if dnsp.DNS_TYPE_PTR in dns_types:	1155	if dnsp.DNS_TYPE_PTR in dns_types:
1156	return 'ptr_record'	1156	return 'ptr_record'
Lines 1158-1164 Link Here
1158	return 'alias'	1158	return 'alias'
1159	elif dnsp.DNS_TYPE_SRV in dns_types:	1159	elif dnsp.DNS_TYPE_SRV in dns_types:
1160	return 'srv_record'	1160	return 'srv_record'
1161	elif dnsp.DNS_TYPE_A in dns_types or dnsp.DNS_TYPE_AAAA:	1161	elif set((dnsp.DNS_TYPE_A, dnsp.DNS_TYPE_AAAA)) & dns_types:
1162	return 'host_record'	1162	return 'host_record'
1163		1163
1164	return None	1164	return None