summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2008-04-28 16:06:23 -0400
committerSimo Sorce <ssorce@redhat.com>2008-05-07 14:44:32 -0400
commit6babe1b8256d1a85e2b9e9e45c2f4a37264293b1 (patch)
tree5767b95b3bf97a16e5e94cc4aa6ccd09f131ebcc
parent8b77a12bf00c6934cd6aefe4e8557feb0ea8d5bd (diff)
downloadfreeipa-6babe1b8256d1a85e2b9e9e45c2f4a37264293b1.tar.gz
freeipa-6babe1b8256d1a85e2b9e9e45c2f4a37264293b1.tar.xz
freeipa-6babe1b8256d1a85e2b9e9e45c2f4a37264293b1.zip
Fix a bug in our dns library, do not return the query as a reply if 0 replies were returned.
-rw-r--r--ipa-python/dnsclient.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/ipa-python/dnsclient.py b/ipa-python/dnsclient.py
index 44dae4d7..58d93d85 100644
--- a/ipa-python/dnsclient.py
+++ b/ipa-python/dnsclient.py
@@ -365,22 +365,22 @@ def dnsParseResults(results):
if not rest:
return []
- rr = DNSResult()
+ qq = DNSResult()
(rest, label) = dnsParseLabel(rest, results)
if label is None:
return []
- if len(rest) < rr.qsize():
+ if len(rest) < qq.qsize():
return []
- rr.qunpack(rest)
+ qq.qunpack(rest)
- rest = rest[rr.qsize():]
+ rest = rest[qq.qsize():]
if DEBUG_DNSCLIENT:
print "Queried for '%s', class = %d, type = %d." % (label,
- rr.dns_class, rr.dns_type)
+ qq.dns_class, qq.dns_type)
for i in xrange(header.dns_ancount + header.dns_nscount + header.dns_arcount):
(rest, label) = dnsParseLabel(rest, results)
@@ -424,8 +424,6 @@ def dnsParseResults(results):
rest = rest[rr.dns_rlength:]
rrlist += [rr]
- if not rrlist:
- rrlist = [rr]
return rrlist
def query(query, qclass, qtype):