summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-07-25 12:38:27 +0200
committerVolker Lendecke <vlendec@samba.org>2011-07-26 11:39:53 +0200
commitaa3f10c61e90e55f2763dd3cb70e8920edc80ab4 (patch)
tree710068ea6e796ff7a8b63e0a19959ccf79efa865
parent51b94ab3fd4d13ee38813eb7d20db11edaa667a8 (diff)
downloadsamba-aa3f10c61e90e55f2763dd3cb70e8920edc80ab4.tar.gz
samba-aa3f10c61e90e55f2763dd3cb70e8920edc80ab4.tar.bz2
samba-aa3f10c61e90e55f2763dd3cb70e8920edc80ab4.zip
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@samba.org> Autobuild-Date: Tue Jul 26 11:39:53 CEST 2011 on sn-devel-104
-rw-r--r--source3/winbindd/winbindd_misc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index 3fb1436820..d2259bef73 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,