summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-03-09 16:08:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:11:10 -0500
commitba8eff660b91841fac333e5a126b6453199ef69a (patch)
tree59f4fd24c4915ab37d14560840a842d5c13fde82
parent9f18298beee5c6abf2cffc9e1d36da2795f4e9d6 (diff)
downloadsamba-ba8eff660b91841fac333e5a126b6453199ef69a.tar.gz
samba-ba8eff660b91841fac333e5a126b6453199ef69a.tar.bz2
samba-ba8eff660b91841fac333e5a126b6453199ef69a.zip
r14076: When the backends trusted_domains call comes back with no trusts the
NTSTATUS code will be NT_STATUS_NO_MORE_ENTRIES. In that case store NT_STATUS_OK in the centry so that the entry does not automatically deleted upon startup or invalidated upon next query. Guenther (This used to be commit 200d4566619c58951e22d9543420407b3baf878f)
-rw-r--r--source3/nsswitch/winbindd_cache.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index 8e694ed850..c99888be3e 100644
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/nsswitch/winbindd_cache.c
@@ -1672,7 +1672,15 @@ do_query:
status = domain->backend->trusted_domains(domain, mem_ctx, num_domains,
names, alt_names, dom_sids);
-
+
+ /* no trusts gives NT_STATUS_NO_MORE_ENTRIES resetting to NT_STATUS_OK
+ * so that the generic centry handling still applies correctly -
+ * Guenther*/
+
+ if (!NT_STATUS_IS_ERR(status)) {
+ status = NT_STATUS_OK;
+ }
+
/* and save it */
refresh_sequence_number(domain, False);