Attachment 144690 Details for Bug 211282 – proposed patch for RHEL-4 (bind-9.2.4)

[patch] proposed patch for RHEL-4 (bind-9.2.4)

bind-9.2.4-edns.patch (text/plain), 3.23 KB, created by Martin Stransky on 2007-01-03 10:45:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Stransky

Created: 2007-01-03 10:45:20 UTC

Size: 3.23 KB

patch

obsolete

>--- bind-9.2.4/doc/misc/options.old	2007-01-02 15:47:52.000000000 +0100
>+++ bind-9.2.4/doc/misc/options	2007-01-02 15:52:06.000000000 +0100
>@@ -96,6 +96,7 @@
>         min-refresh-time <integer>;
>         sig-validity-interval <integer>;
>         zone-statistics <boolean>;
>+	edns-enable <boolean>;
> };
> 
> controls {
>@@ -240,6 +241,7 @@
>         min-refresh-time <integer>;
>         sig-validity-interval <integer>;
>         zone-statistics <boolean>;
>+	edns-enable <boolean>;
> };
> 
> lwres {
>--- bind-9.2.4/lib/dns/include/dns/view.h.old	2004-03-09 07:11:24.000000000 +0100
>+++ bind-9.2.4/lib/dns/include/dns/view.h	2007-01-02 15:54:04.000000000 +0100
>@@ -106,6 +106,7 @@
> 	isc_boolean_t			additionalfromcache;
> 	isc_boolean_t			additionalfromauth;
> 	isc_boolean_t			minimalresponses;
>+	isc_boolean_t                   enableedns;
> 	dns_transfer_format_t		transfer_format;
> 	dns_acl_t *			queryacl;
> 	dns_acl_t *			recursionacl;
>--- bind-9.2.4/lib/dns/view.c.old	2004-03-09 07:11:10.000000000 +0100
>+++ bind-9.2.4/lib/dns/view.c	2007-01-02 15:52:58.000000000 +0100
>@@ -150,6 +150,7 @@
> 	view->auth_nxdomain = ISC_FALSE; /* Was true in BIND 8 */
> 	view->additionalfromcache = ISC_TRUE;
> 	view->additionalfromauth = ISC_TRUE;
>+	view->enableedns = ISC_TRUE;
> 	view->minimalresponses = ISC_FALSE;
> 	view->transfer_format = dns_one_answer;
> 	view->queryacl = NULL;
>--- bind-9.2.4/lib/isccfg/parser.c.old	2007-01-02 16:11:48.000000000 +0100
>+++ bind-9.2.4/lib/isccfg/parser.c	2007-01-02 16:08:08.000000000 +0100
>@@ -853,6 +853,7 @@
> 	{ "use-id-pool", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
> 	{ "use-ixfr", &cfg_type_boolean, 0 },
> 	{ "version", &cfg_type_qstring, 0 },
>+	{ "edns-enable", &cfg_type_boolean, 0 },
> 	{ NULL, NULL, 0 }
> };
> 
>@@ -905,6 +906,7 @@
> 	{ "cache-file", &cfg_type_qstring, 0 },
> 	{ "root-delegation-only",  &cfg_type_optional_exclude, 0 },
> 	{ "edns-udp-size", &cfg_type_uint32, 0 },
>+	{ "edns-enable", &cfg_type_boolean, 0 },
> 	{ NULL, NULL, 0 }
> };
> 
>--- bind-9.2.4/bin/named/server.c.old	2007-01-02 15:47:52.000000000 +0100
>+++ bind-9.2.4/bin/named/server.c	2007-01-02 16:27:21.000000000 +0100
>@@ -703,6 +703,11 @@
> 	if (udpsize > 4096)
> 		udpsize = 4096;
> 	dns_resolver_setudpsize(view->resolver, (isc_uint16_t)udpsize);
>+
>+        obj = NULL;
>+        (void)ns_config_get(maps, "edns-enable", &obj);
>+        if (obj != NULL)
>+               view->enableedns = cfg_obj_asboolean(obj);
> 	
> 	/*
> 	 * A global or view "forwarders" option, if present,
>--- bind-9.2.4/bin/named/query.c.old	2007-01-02 15:47:53.000000000 +0100
>+++ bind-9.2.4/bin/named/query.c	2007-01-02 16:33:40.000000000 +0100
>@@ -3494,6 +3494,12 @@
> 	if (WANTDNSSEC(client))
> 		message->flags |= DNS_MESSAGEFLAG_AD;
> 
>+        /*
>+         * Disable edns if an user require it.
>+         */
>+        if (!client->view->enableedns)
>+                client->query.fetchoptions |= DNS_FETCHOPT_NOEDNS0;
>+
> 	/*
> 	 * Synthesize IPv6 responses if appropriate.
> 	 */
>--- bind-9.2.4/bin/named/config.c.old	2007-01-02 15:47:52.000000000 +0100
>+++ bind-9.2.4/bin/named/config.c	2007-01-02 16:36:13.000000000 +0100
>@@ -66,6 +66,7 @@
> #	named-xfer <obsolete>;\n\
> #	pid-file \"" NS_LOCALSTATEDIR "/named.pid\"; /* or /lwresd.pid */\n\
> 	port 53;\n\
>+	edns-enable yes;\n\
>         edns-udp-size 4096;\n\
> "
> #ifdef PATH_RANDOMDEV

Actions: View | Diff

Attachments on bug 211282: 138786 | 138787 | 140113 | 144690