|
Lines 848-854
Link Here
|
| 848 |
|
848 |
|
| 849 |
dnsRecords=[] |
849 |
dnsRecords=[] |
| 850 |
|
850 |
|
| 851 |
__pack_aRecord(object, dnsRecords) |
851 |
zoneName = object['attributes']['zoneName'][0] |
|
|
852 |
relativeDomainName = object['attributes']['relativeDomainName'][0] |
| 853 |
|
| 854 |
aRecords = s4connector.configRegistry.get('connector/s4/mapping/dns/host_record/%s.%s/static/ipv4' % (relativeDomainName.lower(), zoneName.lower())) |
| 855 |
aAAARecords = s4connector.configRegistry.get('connector/s4/mapping/dns/host_record/%s.%s/static/ipv6' % (relativeDomainName.lower(), zoneName.lower())) |
| 856 |
if aRecords or aAAARecords: |
| 857 |
#IPv4 |
| 858 |
if aRecords: |
| 859 |
for a in aRecords.split(' '): |
| 860 |
a=univention.s4connector.s4.compatible_modstring(a) |
| 861 |
a_record=ARecord(a) |
| 862 |
dnsRecords.append(ndr_pack(a_record)) |
| 863 |
|
| 864 |
#IPv6 |
| 865 |
if aAAARecords: |
| 866 |
for a in aAAARecords.split(' '): |
| 867 |
a=univention.s4connector.s4.compatible_modstring(a) |
| 868 |
a_record=AAAARecord(a) |
| 869 |
dnsRecords.append(ndr_pack(a_record)) |
| 870 |
else: |
| 871 |
__pack_aRecord(object, dnsRecords) |
| 852 |
|
872 |
|
| 853 |
dnsNodeDn=s4_dns_node_base_create(s4connector, object, dnsRecords) |
873 |
dnsNodeDn=s4_dns_node_base_create(s4connector, object, dnsRecords) |
| 854 |
|
874 |
|
|
Lines 861-866
Link Here
|
| 861 |
zoneName = object['attributes']['zoneName'][0] |
881 |
zoneName = object['attributes']['zoneName'][0] |
| 862 |
relativeDomainName = object['attributes']['relativeDomainName'][0] |
882 |
relativeDomainName = object['attributes']['relativeDomainName'][0] |
| 863 |
|
883 |
|
|
|
884 |
aRecords = s4connector.configRegistry.get('connector/s4/mapping/dns/host_record/%s.%s/static/ipv4' % (relativeDomainName.lower(), zoneName.lower())) |
| 885 |
if aRecords: |
| 886 |
ud.debug(ud.LDAP, ud.INFO, 'ucs_host_record_create: do not write host record back from S4 to UCS because location of A record has been overwritten by UCR') |
| 887 |
return |
| 888 |
aAAARecords = s4connector.configRegistry.get('connector/s4/mapping/dns/host_record/%s.%s/static/ipv6' % (relativeDomainName.lower(), zoneName.lower())) |
| 889 |
if aAAARecords: |
| 890 |
ud.debug(ud.LDAP, ud.INFO, 'ucs_host_record_create: do not write host record back from S4 to UCS because location of AAAA record has been overwritten by UCR') |
| 891 |
return |
| 892 |
|
| 864 |
# unpack the host record |
893 |
# unpack the host record |
| 865 |
a=__unpack_aRecord(object) |
894 |
a=__unpack_aRecord(object) |
| 866 |
|
895 |
|