The branch, master has been updated
via e65a24b s4-rpc: dnsserver: Ignore DNS zones that are not used by
RPC dnsserver
via d70f364 s4-dns: dlz_bind9: Ignore zones that are not used by BIND9
DLZ plugin
from 8746faf s4:scripting/python: add '-V' as alias for '--version'
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e65a24b59f1dc7d212a46014a1d7c2531263529f
Author: Amitay Isaacs <ami...@gmail.com>
Date: Tue Oct 2 13:02:07 2012 +1000
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 <ami...@gmail.com>
Autobuild-User(master): Amitay Isaacs <ami...@samba.org>
Autobuild-Date(master): Tue Oct 9 03:21:07 CEST 2012 on sn-devel-104
commit d70f3644a485ef53e6173ef81326ba6f065f418a
Author: Amitay Isaacs <ami...@gmail.com>
Date: Tue Oct 2 13:00:50 2012 +1000
s4-dns: dlz_bind9: Ignore zones that are not used by BIND9 DLZ plugin
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
-----------------------------------------------------------------------
Summary of changes:
source4/dns_server/dlz_bind9.c | 5 +++++
source4/rpc_server/dnsserver/dnsdb.c | 4 ++++
2 files changed, 9 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c
index c3c4172..bea8361 100644
--- a/source4/dns_server/dlz_bind9.c
+++ b/source4/dns_server/dlz_bind9.c
@@ -1146,6 +1146,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);
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, ".");
--
Samba Shared Repository
