summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-03-24 14:39:55 +0000
committerGerald Carter <jerry@samba.org>2005-03-24 14:39:55 +0000
commitb8bc6473c372963fe4f602efb617d2b6daaa2b31 (patch)
tree224580c00d44220848adc638770edef8336e5d15 /source
parentebfeeb536e3ab628adf56c56ef36e100820a2181 (diff)
downloadsamba-b8bc6473c372963fe4f602efb617d2b6daaa2b31.tar.gz
samba-b8bc6473c372963fe4f602efb617d2b6daaa2b31.tar.xz
samba-b8bc6473c372963fe4f602efb617d2b6daaa2b31.zip
r6036: patch from Lin Li <linl@xandros.com> to ensure trusted domains are initialized whenenumerating users and groups
Diffstat (limited to 'source')
-rw-r--r--source/nsswitch/winbindd_group.c4
-rw-r--r--source/nsswitch/winbindd_user.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/source/nsswitch/winbindd_group.c b/source/nsswitch/winbindd_group.c
index 1af9daae46e..c2371c48c58 100644
--- a/source/nsswitch/winbindd_group.c
+++ b/source/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/source/nsswitch/winbindd_user.c b/source/nsswitch/winbindd_user.c
index fc3fe0f9631..e879275c632 100644
--- a/source/nsswitch/winbindd_user.c
+++ b/source/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;