From 14c80ce1b28148986ceab965e44dfacaf5390548 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 6 Jan 2006 00:38:21 +0000 Subject: [PATCH] 1966. [bug] Don't set CD when we have fallen back to plain DNS. [RT #15727] --- lib/dns/resolver.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 9acd154469..a168c3fc1e 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.326 2006/01/05 02:19:02 marka Exp $ */ +/* $Id: resolver.c,v 1.327 2006/01/06 00:38:21 marka Exp $ */ /*! \file */ @@ -1351,6 +1351,12 @@ resquery_send(resquery_t *query) { goto cleanup_message; } + /* + * Clear CD if EDNS is not in use. + */ + if ((query->options & DNS_FETCHOPT_NOEDNS0) != 0) + fctx->qmessage->flags &= ~DNS_MESSAGEFLAG_CD; + /* * Add TSIG record tailored to the current recipient. */