summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2006-12-20 16:57:10 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:39 -0500
commit8b0fce0b0c4fb76d4e89b26eefcd0168f9429f40 (patch)
treeaa65578256771f86297b54a8711963e8a364c2ca
parentbb9ca5025cd9ae065ea1ed47646c51223de3975b (diff)
downloadsamba-8b0fce0b0c4fb76d4e89b26eefcd0168f9429f40.tar.gz
samba-8b0fce0b0c4fb76d4e89b26eefcd0168f9429f40.tar.bz2
samba-8b0fce0b0c4fb76d4e89b26eefcd0168f9429f40.zip
r20287: Allow a NULL sid when setting up the list of trusted domains.
(This used to be commit ccea7155bc8c22816f2622e604e0ef76109487f1)
-rw-r--r--source3/nsswitch/winbindd_util.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c
index 6ae08cc1ac..d0a59b0cbe 100644
--- a/source3/nsswitch/winbindd_util.c
+++ b/source3/nsswitch/winbindd_util.c
@@ -268,8 +268,13 @@ static void trustdom_recv(void *private_data, BOOL success)
*q = '\0';
if (!string_to_sid(&sid, sidstr)) {
- DEBUG(0, ("Got invalid trustdom response\n"));
- break;
+ /* Allow NULL sid for sibling domains */
+ if ( strcmp(sidstr,"S-0-0") == 0) {
+ sid_copy( &sid, &global_sid_NULL);
+ } else {
+ DEBUG(0, ("Got invalid trustdom response\n"));
+ break;
+ }
}
if (find_domain_from_name_noinit(p) == NULL) {