diff options
| author | Volker Lendecke <vl@samba.org> | 2011-08-17 12:05:26 +0200 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2011-08-17 13:59:05 +0200 |
| commit | 3c0b88275629749fba23f0a04cec1aa0a6362927 (patch) | |
| tree | 2de1d6ad8f1d0b99e027919e532da09238182522 /source3 | |
| parent | 31ee78fea9519da4fbe4fe89a35cec9fd6206c31 (diff) | |
| download | samba-3c0b88275629749fba23f0a04cec1aa0a6362927.tar.gz samba-3c0b88275629749fba23f0a04cec1aa0a6362927.tar.bz2 samba-3c0b88275629749fba23f0a04cec1aa0a6362927.zip | |
s3: Next step to fix MIT trusts
aa3f10c was not complete in the sense that it did not fully cover some
conditions that led to invalid domains in the winbind parent
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Wed Aug 17 13:59:06 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/winbindd/winbindd_misc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c index d2259bef73..6f87302050 100644 --- a/source3/winbindd/winbindd_misc.c +++ b/source3/winbindd/winbindd_misc.c @@ -22,6 +22,7 @@ #include "includes.h" #include "winbindd.h" +#include "libcli/security/dom_sid.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND @@ -175,6 +176,9 @@ enum winbindd_result winbindd_dual_list_trusted_domains(struct winbindd_domain * if (trusts.array[i].sid == NULL) { continue; } + if (dom_sid_equal(trusts.array[i].sid, &global_sid_NULL)) { + continue; + } extra_data = talloc_asprintf_append_buffer( extra_data, "%s\\%s\\%s\n", |