s3: Next step to fix MIT trusts
authorVolker Lendecke <vl@samba.org>
Wed, 17 Aug 2011 10:05:26 +0000 (12:05 +0200)
committerMichael Adam <obnox@samba.org>
Tue, 11 Oct 2011 13:21:02 +0000 (15:21 +0200)
aa3f10c was not complete in the sense that it did not fully cover some
conditions that led to invalid domains in the winbind parent

source3/winbindd/winbindd_misc.c

index 16042fb45a90039ec4b61c1df77f9725390dd301..97e94d091ffa23e4b3dadb4191e72f5b039af34d 100644 (file)
@@ -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",