aboutsummaryrefslogtreecommitdiff
path: root/resolv/res_send.c
diff options
context:
space:
mode:
Diffstat (limited to 'resolv/res_send.c')
-rw-r--r--resolv/res_send.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/resolv/res_send.c b/resolv/res_send.c
index 47bfba6747..fce810031f 100644
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -332,6 +332,15 @@ nameserver_offset (struct __res_state *statp)
}
}
+/* Clear the AD bit unless the trust-ad option was specified in the
+ resolver configuration. */
+static void
+mask_ad_bit (struct resolv_context *ctx, void *buf)
+{
+ if (!(ctx->resp->options & RES_TRUSTAD))
+ ((HEADER *) buf)->ad = 0;
+}
+
/* int
* res_queriesmatch(buf1, eom1, buf2, eom2)
* is there a 1:1 mapping of (name,type,class)
@@ -525,6 +534,18 @@ __res_context_send (struct resolv_context *ctx,
resplen = n;
+ /* Mask the AD bit in both responses unless it is
+ marked trusted. */
+ if (resplen > HFIXEDSZ)
+ {
+ if (ansp != NULL)
+ mask_ad_bit (ctx, *ansp);
+ else
+ mask_ad_bit (ctx, ans);
+ }
+ if (resplen2 != NULL && *resplen2 > HFIXEDSZ)
+ mask_ad_bit (ctx, *ansp2);
+
/*
* If we have temporarily opened a virtual circuit,
* or if we haven't been asked to keep a socket open,