Attachment 8266 Details for Bug 9265 – Patch proposed by metze

[patch] Patch proposed by metze

bug-9265.diff (text/plain), 2.26 KB, created by Karolin Seeger on 2012-12-03 12:08:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karolin Seeger

Created: 2012-12-03 12:08:23 UTC

Size: 2.26 KB

patch

obsolete

>From b06c2c75e7ce56f9f032409deeb441379c64ebf6 Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Tue, 2 Oct 2012 13:00:50 +1000
>Subject: [PATCH 1/2] s4-dns: dlz_bind9: Ignore zones that are not used by
> BIND9 DLZ plugin
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>(cherry picked from commit d70f3644a485ef53e6173ef81326ba6f065f418a)
>---
> source4/dns_server/dlz_bind9.c |    5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
>diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c
>index 87d9245..689ed45 100644
>--- a/source4/dns_server/dlz_bind9.c
>+++ b/source4/dns_server/dlz_bind9.c
>@@ -1147,6 +1147,11 @@ _PUBLIC_ isc_result_t dlz_configure(dns_view_t *view, void *dbdata)
> 			if (zone == NULL) {
> 				continue;
> 			}
>+			/* Ignore zones that are not handled in BIND */
>+			if ((strcmp(zone, "RootDNSServers") == 0) ||
>+			    (strcmp(zone, "..TrustAnchors") == 0)) {
>+				continue;
>+			}
> 			zone_dn = ldb_dn_copy(tmp_ctx, dn);
> 			if (zone_dn == NULL) {
> 				talloc_free(tmp_ctx);
>-- 
>1.7.7
>
>
>From 9d80d3a04d4c4fe2c53af10a3460955cf65b604a Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Tue, 2 Oct 2012 13:02:07 +1000
>Subject: [PATCH 2/2] s4-rpc: dnsserver: Ignore DNS zones that are not used by
> RPC dnsserver
>
>..TrustAnchors zone is not interpreted by RPC dnsserver code.
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>
>Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
>Autobuild-Date(master): Tue Oct  9 03:21:07 CEST 2012 on sn-devel-104
>(cherry picked from commit e65a24b59f1dc7d212a46014a1d7c2531263529f)
>---
> source4/rpc_server/dnsserver/dnsdb.c |    4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
>diff --git a/source4/rpc_server/dnsserver/dnsdb.c b/source4/rpc_server/dnsserver/dnsdb.c
>index 9bf5ecf..b5ad470 100644
>--- a/source4/rpc_server/dnsserver/dnsdb.c
>+++ b/source4/rpc_server/dnsserver/dnsdb.c
>@@ -124,6 +124,10 @@ struct dnsserver_zone *dnsserver_db_enumerate_zones(TALLOC_CTX *mem_ctx,
> 		z->partition = p;
> 		name = talloc_strdup(z,
> 				ldb_msg_find_attr_as_string(res->msgs[i], "name", NULL));
>+		if (strcmp(name, "..TrustAnchors") == 0) {
>+			talloc_free(z);
>+			continue;
>+		}
> 		if (strcmp(name, "RootDNSServers") == 0) {
> 			talloc_free(name);
> 			z->name = talloc_strdup(z, ".");
>-- 
>1.7.7
>

Flags:

obnox: review+
obnox: review+
kseeger: review+

Actions: View

Attachments on bug 9265: 8013 | 8014 | 8067 | 8068 | 8069 | 8071 | 8080 | 8081 | 8266