[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  ca52871 s4-setup Remove servicePrincipalName: DNS/${DNSDOMAIN} from new installations
       via  0f2ff7c s3-py_passdb Ensure that group mapping list input is initailised
       via  1fb836d s3-passdb Initialise the correct level of pointer dereference
      from  f4a07f0 s4:join.py - fix up "DsAddEntry" against Windows Server 2000

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


- Log -----------------------------------------------------------------
commit ca52871541bb0303e1b07b7c105424f67bd1c804
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Nov 4 08:45:49 2011 +1100

    s4-setup Remove servicePrincipalName: DNS/${DNSDOMAIN} from new installations
    
    This servicePrincipalName is incorrect (windows does not use that
    servicePrincipalName, as it targets the server it is updating, not the
    root of the DNS tree), and now that we have multiple DNS backends that
    use the internal database, it is quite incorrect (as it cannot exist
    on more than one account).
    
    Andrew Bartlett
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Thu Nov 10 01:11:46 CET 2011 on sn-devel-104

commit 0f2ff7c5c23490adc8c1b7287f8f52dddcf48e15
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Nov 9 08:15:31 2011 +1100

    s3-py_passdb Ensure that group mapping list input is initailised
    
    This may help to ensure we consistantly crash on an incorrect de-reference.
    
    Andrew Bartlett

commit 1fb836d86314ee57519f4bf3247ca58dde70d9df
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Nov 9 08:11:32 2011 +1100

    s3-passdb Initialise the correct level of pointer dereference
    
    *pp_rmap may be NULL or un-initialised data.
    
    This was introduced by 995d1567265be178b4e45f79ea4562a7041ffa52.
    
    Andrew Bartlett

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

Summary of changes:
 source3/passdb/pdb_ldap.c                  |    2 +-
 source3/passdb/py_passdb.c                 |    3 ++-
 source4/setup/provision_dns_add_samba.ldif |    1 -
 source4/setup/secrets_dns.ldif             |    1 -
 4 files changed, 3 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index b59eeb9..a89af80 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -3486,7 +3486,7 @@ static NTSTATUS ldapsam_enum_group_mapping(struct pdb_methods *methods,
 	size_t entries = 0;
 
 	*p_num_entries = 0;
-	**pp_rmap = NULL;
+	*pp_rmap = NULL;
 
 	if (!NT_STATUS_IS_OK(ldapsam_setsamgrent(methods, False))) {
 		DEBUG(0, ("ldapsam_enum_group_mapping: Unable to open "
diff --git a/source3/passdb/py_passdb.c b/source3/passdb/py_passdb.c
index 4c8dbcd..0f71837 100644
--- a/source3/passdb/py_passdb.c
+++ b/source3/passdb/py_passdb.c
@@ -1805,7 +1805,8 @@ static PyObject *py_pdb_enum_group_mapping(pytalloc_Object *self, PyObject *args
 	int unix_only = 0;
 	PyObject *py_domain_sid;
 	struct dom_sid *domain_sid = NULL;
-	GROUP_MAP **gmap, *group_map;
+	GROUP_MAP **gmap = NULL;
+	GROUP_MAP *group_map;
 	size_t num_entries;
 	PyObject *py_gmap_list, *py_group_map;
 	int i;
diff --git a/source4/setup/provision_dns_add_samba.ldif b/source4/setup/provision_dns_add_samba.ldif
index 6c664d9..7fb2e78 100644
--- a/source4/setup/provision_dns_add_samba.ldif
+++ b/source4/setup/provision_dns_add_samba.ldif
@@ -12,6 +12,5 @@ userAccountControl: 512
 accountExpires: 9223372036854775807
 sAMAccountName: dns-${HOSTNAME}
 servicePrincipalName: DNS/${DNSNAME}
-servicePrincipalName: DNS/${DNSDOMAIN}
 clearTextPassword:: ${DNSPASS_B64}
 isCriticalSystemObject: TRUE
diff --git a/source4/setup/secrets_dns.ldif b/source4/setup/secrets_dns.ldif
index 641bce6..67fd66b 100644
--- a/source4/setup/secrets_dns.ldif
+++ b/source4/setup/secrets_dns.ldif
@@ -4,7 +4,6 @@ objectClass: top
 objectClass: secret
 objectClass: kerberosSecret
 realm: ${REALM}
-servicePrincipalName: DNS/${DNSDOMAIN}
 servicePrincipalName: DNS/${DNSNAME}
 msDS-KeyVersionNumber: 1
 privateKeytab: ${DNS_KEYTAB}


-- 
Samba Shared Repository