summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2001-11-15 03:29:00 +0000
committerTim Potter <tpot@samba.org>2001-11-15 03:29:00 +0000
commit2fbd75210b989c3cb044edeb279a18092a148025 (patch)
tree7f0699c9308649de23a69424434474d0d1d0e005
parent0d252203a7098f1cb674db5e9212845e4557d883 (diff)
downloadsamba-2fbd75210b989c3cb044edeb279a18092a148025.tar.gz
samba-2fbd75210b989c3cb044edeb279a18092a148025.tar.bz2
samba-2fbd75210b989c3cb044edeb279a18092a148025.zip
Get list of trusted domains if we haven't fetched them yet.
(This used to be commit 187663210055ecd7b717b3894e3189ca3aaa0ed2)
-rw-r--r--source3/nsswitch/winbindd_misc.c3
-rw-r--r--source3/nsswitch/winbindd_user.c6
2 files changed, 9 insertions, 0 deletions
diff --git a/source3/nsswitch/winbindd_misc.c b/source3/nsswitch/winbindd_misc.c
index 34c340f258..b06ee223a7 100644
--- a/source3/nsswitch/winbindd_misc.c
+++ b/source3/nsswitch/winbindd_misc.c
@@ -140,6 +140,9 @@ enum winbindd_result winbindd_list_trusted_domains(struct winbindd_cli_state
DEBUG(3, ("[%5d]: list trusted domains\n", state->pid));
+ if (domain_list == NULL)
+ get_domain_info();
+
for(domain = domain_list; domain; domain = domain->next) {
/* Skip own domain */
diff --git a/source3/nsswitch/winbindd_user.c b/source3/nsswitch/winbindd_user.c
index c279211589..8dc3e82f42 100644
--- a/source3/nsswitch/winbindd_user.c
+++ b/source3/nsswitch/winbindd_user.c
@@ -302,6 +302,9 @@ enum winbindd_result winbindd_setpwent(struct winbindd_cli_state *state)
/* Create sam pipes for each domain we know about */
+ if (domain_list == NULL)
+ get_domain_info();
+
for(tmp = domain_list; tmp != NULL; tmp = tmp->next) {
struct getent_state *domain_state;
@@ -608,6 +611,9 @@ enum winbindd_result winbindd_list_users(struct winbindd_cli_state *state)
ctr.sam.info1 = &info1;
+ if (domain_list == NULL)
+ get_domain_info();
+
for (domain = domain_list; domain; domain = domain->next) {
NTSTATUS status;
uint32 start_ndx = 0;