summaryrefslogtreecommitdiffstats
path: root/ipalib
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2017-01-20 13:20:08 +0100
committerMartin Babinsky <mbabinsk@redhat.com>2017-01-24 09:58:06 +0100
commitccea23138ba6e9b54c08d472341ddbd64ffc45df (patch)
tree2171e331f6c93d51d7c0ca40ecf9e52251de5b02 /ipalib
parentc56e02b3c5257edbfd3709848ca7eda07e271e38 (diff)
downloadfreeipa-ccea23138ba6e9b54c08d472341ddbd64ffc45df.tar.gz
freeipa-ccea23138ba6e9b54c08d472341ddbd64ffc45df.tar.xz
freeipa-ccea23138ba6e9b54c08d472341ddbd64ffc45df.zip
_resolve_records: fix assert, nameserver_ip can be none
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Diffstat (limited to 'ipalib')
-rw-r--r--ipalib/util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipalib/util.py b/ipalib/util.py
index 81c0e9e5e..1c354b633 100644
--- a/ipalib/util.py
+++ b/ipalib/util.py
@@ -600,7 +600,7 @@ def _resolve_record(owner, rtype, nameserver_ip=None, edns0=False,
:param flag_cd: requires dnssec=True, adds flag CD
:raise DNSException: if error occurs
"""
- assert isinstance(nameserver_ip, six.string_types)
+ assert isinstance(nameserver_ip, six.string_types) or nameserver_ip is None
assert isinstance(rtype, six.string_types)
res = dns.resolver.Resolver()