The branch, master has been updated via 2c3a808 s4-dns: Fix the comments about ignoring zones in internal server from bddd118 s3:smb2_getinfo ensure proper error for not yet present quota support
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 2c3a8081ea2fd7eaa2d7bacffc35e05555a58c54 Author: Matthieu Patou <m...@matws.net> Date: Sat Oct 13 01:36:06 2012 -0700 s4-dns: Fix the comments about ignoring zones in internal server Acked-By: Kai Blin <k...@samba.org> Autobuild-User(master): Kai Blin <k...@samba.org> Autobuild-Date(master): Sat Oct 13 12:37:53 CEST 2012 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source4/dns_server/dns_server.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/dns_server/dns_server.c b/source4/dns_server/dns_server.c index d139eb7..8e25396 100644 --- a/source4/dns_server/dns_server.c +++ b/source4/dns_server/dns_server.c @@ -832,7 +832,13 @@ static void dns_task_init(struct task_server *task) z->name = ldb_msg_find_attr_as_string(res->msgs[i], "name", NULL); z->dn = talloc_move(z, &res->msgs[i]->dn); - /* Ignore the RootDNSServers zone and zones that we don't support yet */ + /* + * Ignore the RootDNSServers zone and zones that we don't support yet + * RootDNSServers should never be returned (Windows DNS server don't) + * ..TrustAnchors should never be returned as is, (Windows returns + * TrustAnchors) and for the moment we don't support DNSSEC so we'd better + * not return this zone. + */ if ((strcmp(z->name, "RootDNSServers") == 0) || (strcmp(z->name, "..TrustAnchors") == 0)) { DEBUG(10, ("Ignoring zone %s\n", z->name)); -- Samba Shared Repository