summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-03-24 14:39:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:17 -0500
commitabde8c438da60d054b8ed0c7b087e4673e63ae13 (patch)
treeba8b887f8db8b4ab3343da959af59acd5e36bddc
parent91e6894031406d23093b3da05263a0e85219b5f3 (diff)
downloadsamba-abde8c438da60d054b8ed0c7b087e4673e63ae13.tar.gz
samba-abde8c438da60d054b8ed0c7b087e4673e63ae13.tar.bz2
samba-abde8c438da60d054b8ed0c7b087e4673e63ae13.zip
r6036: patch from Lin Li <linl@xandros.com> to ensure trusted domains are initialized whenenumerating users and groups
(This used to be commit 105a63c207e8d2b03a30dec2b8b55b92047cba80)
-rw-r--r--source3/nsswitch/winbindd_group.c4
-rw-r--r--source3/nsswitch/winbindd_user.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c
index 1af9daae46..c2371c48c5 100644
--- a/source3/nsswitch/winbindd_group.c
+++ b/source3/nsswitch/winbindd_group.c
@@ -857,6 +857,10 @@ enum winbindd_result winbindd_list_groups(struct winbindd_cli_state *state)
if ( *which_domain && !strequal(which_domain, domain->name) )
continue;
+
+ if ( !domain->initialized )
+ set_dc_type_and_flags( domain );
+
ZERO_STRUCT(groups);
diff --git a/source3/nsswitch/winbindd_user.c b/source3/nsswitch/winbindd_user.c
index fc3fe0f963..e879275c63 100644
--- a/source3/nsswitch/winbindd_user.c
+++ b/source3/nsswitch/winbindd_user.c
@@ -606,6 +606,9 @@ enum winbindd_result winbindd_list_users(struct winbindd_cli_state *state)
if ( *which_domain && !strequal(which_domain, domain->name) )
continue;
+
+ if ( !domain->initialized )
+ set_dc_type_and_flags( domain );
methods = domain->methods;