IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-28 09:06:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix compatibility with python-dns 1.15.0

Browse Source 
From https://github.com/rthalley/dnspython/issues/214:
The FreeIPA code is directly invoking the TXT RR constructor instread
of calling dns.rdata.from_text(), which is how dnspython would like you
to do this kind of thing.

https://fedorahosted.org/freeipa/ticket/6390

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Petr Spacek 2016-10-11 12:09:17 +02:00 committed by Martin Basti
parent 2b8163ab5d
commit 8e02652e7c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ipaserver/dns_data_management.py
View File

@ -8,13 +8,12 @@ import six
from collections import defaultdict from collections import defaultdict
from dns import ( from dns import (
rdata,
rdataclass, rdataclass,
rdatatype, rdatatype,
zone, zone,
) )
from dns.exception import DNSException from dns.exception import DNSException
from dns.rdtypes.IN.SRV import SRV
from dns.rdtypes.ANY.TXT import TXT
from time import sleep, time from time import sleep, time
@ -115,12 +114,11 @@ class IPASystemRecords(object):
suffix = self.domain_abs suffix = self.domain_abs
for name, port in rname_port_map: for name, port in rname_port_map:
rd = SRV( rd = rdata.from_text(
rdataclass.IN, rdatatype.SRV, rdataclass.IN, rdatatype.SRV,
priority, '{0} {1} {2} {3}'.format(
weight, priority, weight, port, hostname.make_absolute()
port, )
hostname.make_absolute()
) )
r_name = name.derelativize(suffix) r_name = name.derelativize(suffix)
@ -158,7 +156,8 @@ class IPASystemRecords(object):
# FIXME: with external DNS, this should generate records for all # FIXME: with external DNS, this should generate records for all
# realmdomains # realmdomains
r_name = DNSName('_kerberos') + self.domain_abs r_name = DNSName('_kerberos') + self.domain_abs
rd = TXT(rdataclass.IN, rdatatype.TXT, [self.api_instance.env.realm]) rd = rdata.from_text(rdataclass.IN, rdatatype.TXT,
self.api_instance.env.realm)
rdataset = zone_obj.get_rdataset( rdataset = zone_obj.get_rdataset(
r_name, rdatatype.TXT, create=True r_name, rdatatype.TXT, create=True
) )