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

diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index d2259bef73e9edaa623aa15c98b65aed49937fcb..6f873020507c58d82d3380ae60e77827d254439b 100644 (file)
--- 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",