Attachment 9053 Details for Bug 45068

[patch] patch

45068.patch (text/plain), 12.20 KB, created by Florian Best on 2017-07-25 14:59 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2017-07-25 14:59 CEST

Size: 12.20 KB

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 25b2482..4be6786 100644
>--- a/services/univention-s4-connector/modules/univention/s4connector/s4/dns.py
>+++ b/services/univention-s4-connector/modules/univention/s4connector/s4/dns.py
>@@ -984,8 +984,7 @@ def ucs_host_record_create(s4connector, object):
> 	ol_filter = format_escaped('(&(relativeDomainName={0!e})(zoneName={1!e}))', relativeDomainName, zoneName)
> 	searchResult = s4connector.lo.search(filter=ol_filter, unique=True)
> 	if len(searchResult) > 0:
>-		superordinate = s4connector_get_superordinate('dns/host_record', s4connector.lo, searchResult[0][0])
>-		newRecord = univention.admin.handlers.dns.host_record.object(None, s4connector.lo, position=None, dn=searchResult[0][0], superordinate=superordinate, attributes=[], update_zone=False)
>+		newRecord = univention.admin.handlers.dns.host_record.object(None, s4connector.lo, position=None, dn=searchResult[0][0], attributes=[], update_zone=False)
> 		newRecord.open()
> 		if set(newRecord['a']) != set(a):
> 			newRecord['a'] = a
>@@ -996,12 +995,10 @@ def ucs_host_record_create(s4connector, object):
> 		zoneDN = __get_zone_dn(s4connector, zoneName)
> 
> 		ud.debug(ud.LDAP, ud.INFO, 'ucs_host_record_create: zoneDN: %s' % zoneDN)
>-		superordinate = s4connector_get_superordinate('dns/host_record', s4connector.lo, zoneDN)
>-		ud.debug(ud.LDAP, ud.INFO, 'ucs_host_record_create: superordinate: %s' % superordinate)
> 
> 		position = univention.admin.uldap.position(zoneDN)
> 
>-		newRecord = univention.admin.handlers.dns.host_record.object(None, s4connector.lo, position, dn=None, superordinate=superordinate, attributes=[], update_zone=False)
>+		newRecord = univention.admin.handlers.dns.host_record.object(None, s4connector.lo, position, dn=None, attributes=[], update_zone=False)
> 		newRecord.open()
> 		newRecord['name'] = relativeDomainName
> 		newRecord['a'] = a
>@@ -1018,8 +1015,7 @@ def ucs_host_record_delete(s4connector, object):
> 	ol_filter = format_escaped('(&(relativeDomainName={0!e})(zoneName={1!e}))', relativeDomainName, zoneName)
> 	searchResult = s4connector.lo.search(filter=ol_filter, unique=True)
> 	if len(searchResult) > 0:
>-		superordinate = s4connector_get_superordinate('dns/host_record', s4connector.lo, searchResult[0][0])
>-		newRecord = univention.admin.handlers.dns.host_record.object(None, s4connector.lo, position=None, dn=searchResult[0][0], superordinate=superordinate, attributes=[], update_zone=False)
>+		newRecord = univention.admin.handlers.dns.host_record.object(None, s4connector.lo, position=None, dn=searchResult[0][0], attributes=[], update_zone=False)
> 		newRecord.open()
> 		newRecord.delete()
> 	else:
>@@ -1054,8 +1050,7 @@ def ucs_ptr_record_create(s4connector, object):
> 	ol_filter = format_escaped('(&(relativeDomainName={0!e})(zoneName={1!e}))', relativeDomainName, zoneName)
> 	searchResult = s4connector.lo.search(filter=ol_filter, unique=True)
> 	if len(searchResult) > 0:
>-		superordinate = s4connector_get_superordinate('dns/ptr_record', s4connector.lo, searchResult[0][0])
>-		newRecord = univention.admin.handlers.dns.ptr_record.object(None, s4connector.lo, position=None, dn=searchResult[0][0], superordinate=superordinate, attributes=[], update_zone=False)
>+		newRecord = univention.admin.handlers.dns.ptr_record.object(None, s4connector.lo, position=None, dn=searchResult[0][0], attributes=[], update_zone=False)
> 		newRecord.open()
> 		if set(newRecord['ptr_record']) != set(ptr):
> 			newRecord['ptr_record'] = ptr[0]
>@@ -1065,12 +1060,9 @@ def ucs_ptr_record_create(s4connector, object):
> 	else:
> 		zoneDN = __get_zone_dn(s4connector, zoneName)
> 
>-		superordinate = s4connector_get_superordinate('dns/ptr_record', s4connector.lo, zoneDN)
>-		ud.debug(ud.LDAP, ud.INFO, 'ucs_ptr_record_create: superordinate: %s' % superordinate)
>-
> 		position = univention.admin.uldap.position(zoneDN)
> 
>-		newRecord = univention.admin.handlers.dns.ptr_record.object(None, s4connector.lo, position, dn=None, superordinate=superordinate, attributes=[], update_zone=False)
>+		newRecord = univention.admin.handlers.dns.ptr_record.object(None, s4connector.lo, position, dn=None, attributes=[], update_zone=False)
> 		newRecord.open()
> 		newRecord['address'] = relativeDomainName
> 		newRecord['ptr_record'] = ptr[0]
>@@ -1087,8 +1079,7 @@ def ucs_ptr_record_delete(s4connector, object):
> 	ol_filter = format_escaped('(&(relativeDomainName={0!e})(zoneName={1!e}))', relativeDomainName, zoneName)
> 	searchResult = s4connector.lo.search(filter=ol_filter, unique=True)
> 	if len(searchResult) > 0:
>-		superordinate = s4connector_get_superordinate('dns/ptr_record', s4connector.lo, searchResult[0][0])
>-		newRecord = univention.admin.handlers.dns.ptr_record.object(None, s4connector.lo, position=None, dn=searchResult[0][0], superordinate=superordinate, attributes=[], update_zone=False)
>+		newRecord = univention.admin.handlers.dns.ptr_record.object(None, s4connector.lo, position=None, dn=searchResult[0][0], attributes=[], update_zone=False)
> 		newRecord.open()
> 		newRecord.delete()
> 	else:
>@@ -1111,8 +1102,7 @@ def ucs_cname_create(s4connector, object):
> 	ol_filter = format_escaped('(&(relativeDomainName={0!e})(zoneName={1!e}))', relativeDomainName, zoneName)
> 	searchResult = s4connector.lo.search(filter=ol_filter, unique=True)
> 	if len(searchResult) > 0:
>-		superordinate = s4connector_get_superordinate('dns/alias', s4connector.lo, searchResult[0][0])
>-		newRecord = univention.admin.handlers.dns.alias.object(None, s4connector.lo, position=None, dn=searchResult[0][0], superordinate=superordinate, attributes=[], update_zone=False)
>+		newRecord = univention.admin.handlers.dns.alias.object(None, s4connector.lo, position=None, dn=searchResult[0][0], attributes=[], update_zone=False)
> 		newRecord.open()
> 		if set(newRecord['cname']) != set(c):
> 			newRecord['cname'] = c[0]
>@@ -1122,12 +1112,9 @@ def ucs_cname_create(s4connector, object):
> 	else:
> 		zoneDN = __get_zone_dn(s4connector, zoneName)
> 
>-		superordinate = s4connector_get_superordinate('dns/alias', s4connector.lo, zoneDN)
>-		ud.debug(ud.LDAP, ud.INFO, 'ucs_cname_create: superordinate: %s' % superordinate)
>-
> 		position = univention.admin.uldap.position(zoneDN)
> 
>-		newRecord = univention.admin.handlers.dns.alias.object(None, s4connector.lo, position, dn=None, superordinate=superordinate, attributes=[], update_zone=False)
>+		newRecord = univention.admin.handlers.dns.alias.object(None, s4connector.lo, position, dn=None, attributes=[], update_zone=False)
> 		newRecord.open()
> 		newRecord['name'] = relativeDomainName
> 		newRecord['cname'] = c[0]
>@@ -1144,8 +1131,7 @@ def ucs_cname_delete(s4connector, object):
> 	ol_filter = format_escaped('(&(relativeDomainName={0!e})(zoneName={1!e}))', relativeDomainName, zoneName)
> 	searchResult = s4connector.lo.search(filter=ol_filter, unique=True)
> 	if len(searchResult) > 0:
>-		superordinate = s4connector_get_superordinate('dns/alias', s4connector.lo, searchResult[0][0])
>-		newRecord = univention.admin.handlers.dns.alias.object(None, s4connector.lo, position=None, dn=searchResult[0][0], superordinate=superordinate, attributes=[], update_zone=False)
>+		newRecord = univention.admin.handlers.dns.alias.object(None, s4connector.lo, position=None, dn=searchResult[0][0], attributes=[], update_zone=False)
> 		newRecord.open()
> 		newRecord.delete()
> 	else:
>@@ -1185,8 +1171,7 @@ def ucs_srv_record_create(s4connector, object):
> 	ol_filter = format_escaped('(&(relativeDomainName={0!e})(zoneName={1!e}))', relativeDomainName, zoneName)
> 	searchResult = s4connector.lo.search(filter=ol_filter, unique=True)
> 	if len(searchResult) > 0:
>-		superordinate = s4connector_get_superordinate('dns/srv_record', s4connector.lo, searchResult[0][0])
>-		newRecord = univention.admin.handlers.dns.srv_record.object(None, s4connector.lo, position=None, dn=searchResult[0][0], superordinate=superordinate, attributes=[], update_zone=False)
>+		newRecord = univention.admin.handlers.dns.srv_record.object(None, s4connector.lo, position=None, dn=searchResult[0][0], attributes=[], update_zone=False)
> 		newRecord.open()
> 		if ucr_locations:
> 			ud.debug(ud.LDAP, ud.INFO, 'ucs_srv_record_create: do not write SRV record back from S4 to UCS because location of SRV record have been overwritten by UCR')
>@@ -1203,12 +1188,9 @@ def ucs_srv_record_create(s4connector, object):
> 	else:
> 		zoneDN = __get_zone_dn(s4connector, zoneName)
> 
>-		superordinate = s4connector_get_superordinate('dns/srv_record', s4connector.lo, zoneDN)
>-		ud.debug(ud.LDAP, ud.INFO, 'ucs_srv_record_create: superordinate: %s' % superordinate)
>-
> 		position = univention.admin.uldap.position(zoneDN)
> 
>-		newRecord = univention.admin.handlers.dns.srv_record.object(None, s4connector.lo, position, dn=None, superordinate=superordinate, attributes=[], update_zone=False)
>+		newRecord = univention.admin.handlers.dns.srv_record.object(None, s4connector.lo, position, dn=None, attributes=[], update_zone=False)
> 		newRecord.open()
> 		# Make syntax UDM compatible
> 		parts = univention.admin.handlers.dns.srv_record.unmapName([relativeDomainName])
>@@ -1235,8 +1217,7 @@ def ucs_srv_record_delete(s4connector, object):
> 	ol_filter = format_escaped('(&(relativeDomainName={0!e})(zoneName={1!e}))', relativeDomainName, zoneName)
> 	searchResult = s4connector.lo.search(filter=ol_filter, unique=True)
> 	if len(searchResult) > 0:
>-		superordinate = s4connector_get_superordinate('dns/srv_record', s4connector.lo, searchResult[0][0])
>-		newRecord = univention.admin.handlers.dns.srv_record.object(None, s4connector.lo, position=None, dn=searchResult[0][0], superordinate=superordinate, attributes=[], update_zone=False)
>+		newRecord = univention.admin.handlers.dns.srv_record.object(None, s4connector.lo, position=None, dn=searchResult[0][0], attributes=[], update_zone=False)
> 		newRecord.open()
> 		newRecord.delete()
> 	else:
>@@ -1305,8 +1286,7 @@ def ucs_txt_record_create(s4connector, object):
> 	ol_filter = format_escaped('(&(relativeDomainName={0!e})(zoneName={1!e}))', relativeDomainName, zoneName)
> 	searchResult = s4connector.lo.search(filter=ol_filter, unique=True)
> 	if len(searchResult) > 0:
>-		superordinate = s4connector_get_superordinate('dns/txt_record', s4connector.lo, searchResult[0][0])
>-		foundRecord = univention.admin.handlers.dns.txt_record.object(None, s4connector.lo, position=None, dn=searchResult[0][0], superordinate=superordinate, attributes=[], update_zone=False)
>+		foundRecord = univention.admin.handlers.dns.txt_record.object(None, s4connector.lo, position=None, dn=searchResult[0][0], attributes=[], update_zone=False)
> 		foundRecord.open()
> 
> 		# use normalized TXT records for comparison
>@@ -1323,12 +1303,9 @@ def ucs_txt_record_create(s4connector, object):
> 	else:
> 		zoneDN = __get_zone_dn(s4connector, zoneName)
> 
>-		superordinate = s4connector_get_superordinate('dns/txt_record', s4connector.lo, zoneDN)
>-		ud.debug(ud.LDAP, ud.INFO, 'ucs_txt_record_create: superordinate: %s' % superordinate)
>-
> 		position = univention.admin.uldap.position(zoneDN)
> 
>-		newRecord = univention.admin.handlers.dns.txt_record.object(None, s4connector.lo, position, dn=None, superordinate=superordinate, attributes=[], update_zone=False)
>+		newRecord = univention.admin.handlers.dns.txt_record.object(None, s4connector.lo, position, dn=None, attributes=[], update_zone=False)
> 		newRecord.open()
> 		newRecord['name'] = relativeDomainName
> 		newRecord[udm_property] = c
>@@ -1345,8 +1322,7 @@ def ucs_txt_record_delete(s4connector, object):
> 	ol_filter = format_escaped('(&(relativeDomainName={0!e})(zoneName={1!e}))', relativeDomainName, zoneName)
> 	searchResult = s4connector.lo.search(filter=ol_filter, unique=True)
> 	if len(searchResult) > 0:
>-		superordinate = s4connector_get_superordinate('dns/txt_record', s4connector.lo, searchResult[0][0])
>-		newRecord = univention.admin.handlers.dns.txt_record.object(None, s4connector.lo, position=None, dn=searchResult[0][0], superordinate=superordinate, attributes=[], update_zone=False)
>+		newRecord = univention.admin.handlers.dns.txt_record.object(None, s4connector.lo, position=None, dn=searchResult[0][0], attributes=[], update_zone=False)
> 		newRecord.open()
> 		newRecord.delete()
> 	else:
>@@ -1685,7 +1661,3 @@ def con2ucs(s4connector, key, object):
> 		# ignore move
> 
> 	return True
>-
>-
>-def s4connector_get_superordinate(module, lo, dn):
>-	return univention.admin.objects.get_superordinate(module, None, lo, dn)

Actions: View | Diff

Attachments on bug 45068: 9053 | 9959