[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  aa3f10c s3: Fix MIT trusts
      from  51b94ab s4:kdc: canonicalize the principal if HDB_F_FOR_TGS_REQ is given

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


- Log -----------------------------------------------------------------
commit aa3f10c61e90e55f2763dd3cb70e8920edc80ab4
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Jul 25 12:38:27 2011 +0200

    s3: Fix MIT trusts
    
    Winbind can't really cope with trusts that don't have a SID associated. This
    happens with external MIT trusts for example. This filters them out when
    sending the trust list from child to parent.
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Tue Jul 26 11:39:53 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/winbindd/winbindd_misc.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index 3fb1436..d2259be 100644
--- a/source3/winbindd/winbindd_misc.c
+++ b/source3/winbindd/winbindd_misc.c
@@ -171,6 +171,11 @@ enum winbindd_result winbindd_dual_list_trusted_domains(struct winbindd_domain *
 	extra_data = talloc_strdup(state->mem_ctx, "");
 
 	for (i=0; i<trusts.count; i++) {
+
+		if (trusts.array[i].sid == NULL) {
+			continue;
+		}
+
 		extra_data = talloc_asprintf_append_buffer(
 			extra_data, "%s\\%s\\%s\n",
 			trusts.array[i].netbios_name,


-- 
Samba Shared Repository