sync 3.0 into HEAD for the last time

[vlendec/samba-autobuild/.git] / source3 / nsswitch / winbindd.c

diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 8345fa11d0c33afa710c856f28b61df577e2deb0..6a0056f917e1ad98e5ce31ede932a0ca3aeb8eed 100644 (file)
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -570,9 +570,9 @@ static void process_loop(void)
 
                message_dispatch();
 
-               /* rescan the trusted domains list. This must be done
-                  regularly to cope with transitive trusts */
-               rescan_trusted_domains(False);
+               /* refresh the trusted domain cache */
+                  
+               rescan_trusted_domains();
 
                /* Free up temporary memory */
 
@@ -829,7 +829,7 @@ int main(int argc, char **argv)
        setup_logging("winbindd", log_stdout);
        reopen_logs();
 
-       DEBUG(1, ("winbindd version %s started.\n", VERSION ) );
+       DEBUG(1, ("winbindd version %s started.\n", SAMBA_VERSION_STRING) );
        DEBUGADD( 1, ( "Copyright The Samba Team 2000-2003\n" ) );
 
        if (!reload_services_file(False)) {