diff options
| author | Andrew Tridgell <tridge@samba.org> | 2002-10-15 23:44:15 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2002-10-15 23:44:15 +0000 |
| commit | d0c11644dc751f8a27efaa318f48064e43cc5eb2 (patch) | |
| tree | c754d44413ecbeb43d00b962fba6c9f6b3c6fabc /source3/nsswitch | |
| parent | 909ac9ed0d320d9a384b495feb9ff6417ba617b9 (diff) | |
| download | samba-d0c11644dc751f8a27efaa318f48064e43cc5eb2.tar.gz samba-d0c11644dc751f8a27efaa318f48064e43cc5eb2.tar.bz2 samba-d0c11644dc751f8a27efaa318f48064e43cc5eb2.zip | |
- we need to rescan the trusted domain list regularly to cope with
transitive trusts, and trusts that are added while winbindd is running
- removed an unnecessary call to time()
(This used to be commit 14489ff30bb9eca2c55d36a69c0b45a2db339061)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/winbindd.c | 4 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_util.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c index d394a57837..5b9c5418a1 100644 --- a/source3/nsswitch/winbindd.c +++ b/source3/nsswitch/winbindd.c @@ -521,6 +521,10 @@ static void process_loop(int accept_sock) message_dispatch(); + /* rescan the trusted domains list. This must be done + regularly to cope with transitive trusts */ + rescan_trusted_domains(); + /* Free up temporary memory */ lp_talloc_free(); diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index 00354187aa..c8afea2f72 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -157,7 +157,7 @@ void rescan_trusted_domains(void) if ((unsigned)(t - last_scan) < WINBINDD_RESCAN_FREQ) { return; } - last_scan = time(NULL); + last_scan = t; DEBUG(1, ("scanning trusted domain list\n")); |