summaryrefslogtreecommitdiff
path: root/source3/nsswitch/winbindd.c
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-08-08 23:53:13 +0000
committerGerald Carter <jerry@samba.org>2003-08-08 23:53:13 +0000
commit4b5257b5b09d2490b2f4dc48e2181fde2a67cb5f (patch)
tree29e4770b2b36667df0db73502a911f9f63579986 /source3/nsswitch/winbindd.c
parentac8c6e47463545011f5471960c2a2073a9b04979 (diff)
downloadsamba-4b5257b5b09d2490b2f4dc48e2181fde2a67cb5f.tar.gz
samba-4b5257b5b09d2490b2f4dc48e2181fde2a67cb5f.tar.bz2
samba-4b5257b5b09d2490b2f4dc48e2181fde2a67cb5f.zip
fix 2 bugs:
1) don't ask trusted DC's for a list of trusted domains. This causes us to treat non-transitive ones as if they were transitive. Not needed anyways 2) Fix dc lookup bug where we would always try to use DNS to resolve the DC's for a domain (even if it was a trusted NT4 domain). (This used to be commit 4d3acce5066d3adf53ee8fbaa627c42523b3cbc3)
Diffstat (limited to 'source3/nsswitch/winbindd.c')
-rw-r--r--source3/nsswitch/winbindd.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 8345fa11d0..313161f5fa 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -570,9 +570,15 @@ static void process_loop(void)
message_dispatch();
- /* rescan the trusted domains list. This must be done
+#if 0
+ /* not needed any more since we use a single RPC to
+ get transitive trusts --jerry
+
+ rescan the trusted domains list. This must be done
regularly to cope with transitive trusts */
+
rescan_trusted_domains(False);
+#endif
/* Free up temporary memory */