add want_dnssec parameter to make_query()

diff --git a/ChangeLog b/ChangeLog
index a16ad69cccb08b447352a6e315a8c465dd3951b9..607396fe4818018b05167ac62c38bfc980e92bc7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
        * dns/message.py (Message.want_dnssec): add convenience method for
          enabling/disabling the "DNSSEC desired" flag in requests.
 
+       * dns/message.py (make_query): add "want_dnssec" parameter.
+
 2006-08-17  Bob Halley  <halley@dnspython.org>
 
        * dns/resolver.py (Resolver.read_resolv_conf): If /etc/resolv.conf

diff --git a/dns/message.py b/dns/message.py
index 32c5454ef1a98f79dedc43ab24392cf551ff8ba7..6460752e230caf35f84c689abd2e47f658331005 100644 (file)
--- a/dns/message.py
+++ b/dns/message.py
@@ -478,7 +478,7 @@ class Message(object):
         self.request_payload = request_payload
 
     def want_dnssec(self, wanted=True):
-        """Enable or disable DNSSEC in requests.
+        """Enable or disable 'DNSSEC desired' flag in requests.
         @param wanted: Is DNSSEC desired?  If True, EDNS is enabled if
         required, and then the DO bit is set.  If False, the DO bit is
         cleared if EDNS is enabled.
@@ -960,7 +960,7 @@ def from_file(f):
             f.close()
     return m
 
-def make_query(qname, rdtype, rdclass = dns.rdataclass.IN):
+def make_query(qname, rdtype, rdclass = dns.rdataclass.IN, want_dnssec=False):
     """Make a query message.
 
     The query name, type, and class may all be specified either
@@ -975,6 +975,8 @@ def make_query(qname, rdtype, rdclass = dns.rdataclass.IN):
     @type rdtype: int
     @param rdclass: The desired rdata class; the default is class IN.
     @type rdclass: int
+    @param want_dnssec: Should the query indicate that DNSSEC is desired?
+    @type want_dnssec: bool
     @rtype: dns.message.Message object"""
     
     if isinstance(qname, (str, unicode)):
@@ -987,6 +989,7 @@ def make_query(qname, rdtype, rdclass = dns.rdataclass.IN):
     m.flags |= dns.flags.RD
     m.find_rrset(m.question, qname, rdclass, rdtype, create=True,
                  force_unique=True)
+    m.want_dnssec(want_dnssec)
     return m
 
 def make_response(query, recursion_available=False, our_payload=8192):