summaryrefslogtreecommitdiffstats
path: root/bind-9.5-edns.patch
diff options
context:
space:
mode:
authorAdam Tkac <atkac@fedoraproject.org>2008-05-13 07:09:15 +0000
committerAdam Tkac <atkac@fedoraproject.org>2008-05-13 07:09:15 +0000
commit038864092f0bd2218abbe69af42fa0c4f3fd4e55 (patch)
treef1877abffd0cd33d2c8d5372c7d8774edcfee5c8 /bind-9.5-edns.patch
parentb246b77488d54d21f20af967da909225d65bb838 (diff)
downloadbind-038864092f0bd2218abbe69af42fa0c4f3fd4e55.tar.gz
bind-038864092f0bd2218abbe69af42fa0c4f3fd4e55.tar.xz
bind-038864092f0bd2218abbe69af42fa0c4f3fd4e55.zip
- reverted "any" patch, upstream says not neededbind-9_5_0-32_b3_fc10
- log EDNS failure only when we really switch to plain EDNS (#275091) - detect configuration file better
Diffstat (limited to 'bind-9.5-edns.patch')
-rw-r--r--bind-9.5-edns.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/bind-9.5-edns.patch b/bind-9.5-edns.patch
new file mode 100644
index 0000000..40f6412
--- /dev/null
+++ b/bind-9.5-edns.patch
@@ -0,0 +1,21 @@
+diff -up bind-9.5.0b3/lib/dns/resolver.c.edns bind-9.5.0b3/lib/dns/resolver.c
+--- bind-9.5.0b3/lib/dns/resolver.c.edns 2008-05-13 08:55:43.000000000 +0200
++++ bind-9.5.0b3/lib/dns/resolver.c 2008-05-13 08:58:12.000000000 +0200
+@@ -1552,13 +1552,16 @@ resquery_send(resquery_t *query) {
+ dns_peer_getsupportedns(peer, &useedns) == ISC_R_SUCCESS &&
+ !useedns)
+ {
+- query->options |= DNS_FETCHOPT_NOEDNS0;
+ dns_adb_changeflags(fctx->adb,
+ query->addrinfo,
+ DNS_FETCHOPT_NOEDNS0,
+ DNS_FETCHOPT_NOEDNS0);
+ }
+
++ /* Sync query->options and query->addrinfo->flags now */
++ if ((query->addrinfo->flags & DNS_FETCHOPT_NOEDNS0) != 0)
++ query->options |= DNS_FETCHOPT_NOEDNS0;
++
+ /*
+ * Use EDNS0, unless the caller doesn't want it, or we know that
+ * the remote server doesn't like it.