- For #802: Cleanup comments and add RCODE check for CD bit test case.

diff --git a/services/mesh.c b/services/mesh.c
index dcaa3cc3282ed93902b4ef6dc4635fed8a6af94a..23d59f9f967ddc081fd8361f495b5a51c7987461 100644 (file)
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -1479,9 +1479,6 @@ mesh_send_reply(struct mesh_state* m, int rcode, struct reply_info* rep,
                        error_encode(r_buffer, LDNS_RCODE_SERVFAIL,
                                &m->s.qinfo, r->qid, r->qflags, &r->edns);
                }
-
-               /* Send along EDE BOGUS EDNS0 option when validation is bogus */
-
                m->reply_list = NULL;
                comm_point_send_reply(&r->query_reply);
                m->reply_list = rlist;

diff --git a/testdata/ede.tdir/ede.test b/testdata/ede.tdir/ede.test
index 0ce8b92a5f9e9712712265a287526739d9603027..7ce05faf93a46a2806671a51c67237dede498c57 100644 (file)
--- a/testdata/ede.tdir/ede.test
+++ b/testdata/ede.tdir/ede.test
@@ -71,6 +71,12 @@ fi
 # EDE with CD bit set (EDE but no SERVFAIL)
 dig @127.0.0.1 -p $UNBOUND_PORT cd.dnskey-failures.test +cd > cd_bit_ede.txt
 
+if ! grep -q -e "NXDOMAIN" cd_bit_ede.txt
+then
+       echo "No NXDOMAIN reply with CD bit set"
+       cat cd_bit_ede.txt
+       exit 1
+fi
 if ! grep -q -e "OPT=15: 00 09" -e "EDE: 9" cd_bit_ede.txt
 then
        echo "No EDE attached with CD bit set"
@@ -78,4 +84,5 @@ then
        exit 1
 fi
 
+# TODO EDE with CD bit set (EDE but no SERVFAIL) for a cached answer
 # TODO DNSSEC indeterminate when implemented