git.samba.org
/
samba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dnspython: Merge in new upstream.
[samba.git]
/
lib
/
dnspython
/
dns
/
resolver.py
diff --git
a/lib/dnspython/dns/resolver.py
b/lib/dnspython/dns/resolver.py
index f803eb6d2087ef7243ee1f28ff830ce8f2d45563..30977f3a8bbb98164be057ce1952d426620317ce 100644
(file)
--- a/
lib/dnspython/dns/resolver.py
+++ b/
lib/dnspython/dns/resolver.py
@@
-61,6
+61,10
@@
class NoRootSOA(dns.exception.DNSException):
This should never happen!"""
pass
This should never happen!"""
pass
+class NoMetaqueries(dns.exception.DNSException):
+ """Metaqueries are not allowed."""
+ pass
+
class Answer(object):
"""DNS stub resolver answer
class Answer(object):
"""DNS stub resolver answer
@@
-571,8
+575,12
@@
class Resolver(object):
qname = dns.name.from_text(qname, None)
if isinstance(rdtype, (str, unicode)):
rdtype = dns.rdatatype.from_text(rdtype)
qname = dns.name.from_text(qname, None)
if isinstance(rdtype, (str, unicode)):
rdtype = dns.rdatatype.from_text(rdtype)
+ if dns.rdatatype.is_metatype(rdtype):
+ raise NoMetaqueries
if isinstance(rdclass, (str, unicode)):
rdclass = dns.rdataclass.from_text(rdclass)
if isinstance(rdclass, (str, unicode)):
rdclass = dns.rdataclass.from_text(rdclass)
+ if dns.rdataclass.is_metaclass(rdclass):
+ raise NoMetaqueries
qnames_to_try = []
if qname.is_absolute():
qnames_to_try.append(qname)
qnames_to_try = []
if qname.is_absolute():
qnames_to_try.append(qname)