[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  ebcf45b s4:dlz_bind9: add no memory checks
       via  d9558fd s4:dlz_bind9: Copy dn before changing in b9_has_soa
       via  c88195f s4:dlz_bind9: add missing earch bases for windows 2000 domains
      from  2a2dd6f s3: Before adding KDC's to the krb5.conf, cldap ping them

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ebcf45b5506013b2cbcc706e09f26198c07382d3
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Oct 17 12:10:10 2011 +0200

    s4:dlz_bind9: add no memory checks
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Oct 17 14:07:25 CEST 2011 on sn-devel-104

commit d9558fdc34a690230cd4927df45f4353bd5cc498
Author: Stefan Gohmann <gohmann at univention.de>
Date:   Thu Oct 13 15:23:58 2011 +0200

    s4:dlz_bind9: Copy dn before changing in b9_has_soa
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

commit c88195fbe3a6b201f24ffb1ababdac22dd2c33a3
Author: Stefan Gohmann <gohmann at univention.de>
Date:   Fri Sep 16 15:36:08 2011 +0200

    s4:dlz_bind9: add missing earch bases for windows 2000 domains
    
    By default the samba4 dlz_bind9 backend searches under
    CN=MicrosoftDNS,DC=DomainDnsZones and CN=MicrosoftDNS,DC=ForestDnsZones.
    
    In my samba4 test setup all DNS zones are under CN=MicrosoftDNS,CN=System.
    After adding the attached patch it works fine for me.
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source4/dns_server/dlz_bind9.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c
index 4873112..e37a66e 100644
--- a/source4/dns_server/dlz_bind9.c
+++ b/source4/dns_server/dlz_bind9.c
@@ -53,6 +53,7 @@ struct dlz_bind9_data {
 static const char *zone_prefixes[] = {
 	"CN=MicrosoftDNS,DC=DomainDnsZones",
 	"CN=MicrosoftDNS,DC=ForestDnsZones",
+	"CN=MicrosoftDNS,CN=System",
 	NULL
 };
 
@@ -1014,10 +1015,18 @@ _PUBLIC_ isc_result_t dlz_configure(dns_view_t *view, void *dbdata)
 		for (j=0; j<res->count; j++) {
 			isc_result_t result;
 			const char *zone = ldb_msg_find_attr_as_string(res->msgs[j], "name", NULL);
+			struct ldb_dn *zone_dn;
+
 			if (zone == NULL) {
 				continue;
 			}
-			if (!b9_has_soa(state, dn, zone)) {
+			zone_dn = ldb_dn_copy(tmp_ctx, dn);
+			if (zone_dn == NULL) {
+				talloc_free(tmp_ctx);
+				return ISC_R_NOMEMORY;
+			}
+
+			if (!b9_has_soa(state, zone_dn, zone)) {
 				continue;
 			}
 			result = state->writeable_zone(view, zone);


-- 
Samba Shared Repository