BIND 10 master, updated. 8f3e82a987df1e5abc1ab2d4f0785ca3f9ab97ff [master] Merge branch 'trac1757'

[BIND 10 source code commits]

The branch, master has been updated
       via  8f3e82a987df1e5abc1ab2d4f0785ca3f9ab97ff (commit)
       via  c30d4ccd7f07819b60695d11dd5f946b61e8fe17 (commit)
      from  e663cfecd5385a0d2e27c301f089e1f60d3e9a28 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8f3e82a987df1e5abc1ab2d4f0785ca3f9ab97ff
Merge: e663cfecd5385a0d2e27c301f089e1f60d3e9a28 c30d4ccd7f07819b60695d11dd5f946b61e8fe17
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Apr 5 11:34:38 2012 +0200

    [master] Merge branch 'trac1757'

-----------------------------------------------------------------------

Summary of changes:
 tests/lettuce/features/terrain/querying.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/tests/lettuce/features/terrain/querying.py b/tests/lettuce/features/terrain/querying.py
index 408ff72..a547014 100644
--- a/tests/lettuce/features/terrain/querying.py
+++ b/tests/lettuce/features/terrain/querying.py
@@ -229,6 +229,11 @@ def query(step, dnssec, query_name, qtype, qclass, addr, port, rcode):
     additional_arguments = []
     if dnssec is not None:
         additional_arguments.append("+dnssec")
+    else:
+        # some builds of dig add edns0 by default. This could muck up
+        # additional counts, so unless we need dnssec, explicitly
+        # disable edns0
+        additional_arguments.append("+noedns")
     query_result = QueryResult(query_name, qtype, qclass, addr, port,
                                additional_arguments)
     assert query_result.rcode == rcode,\