svn commit: samba r20058 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_24/source/nsswitch

[jra at samba.org]

Author: jra
Date: 2006-12-07 00:08:10 +0000 (Thu, 07 Dec 2006)
New Revision: 20058

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20058

Log:
Ensure we actually do the increasing time
calculation when in offline mode.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
   branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2006-12-06 23:14:15 UTC (rev 20057)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2006-12-07 00:08:10 UTC (rev 20058)
@@ -171,9 +171,7 @@
 	/* If we're in statup mode, check again in 10 seconds, not in
 	   lp_winbind_cache_time() seconds (which is 5 mins by default). */
 
-	if (domain->check_online_timeout == 0) {
-		calc_new_online_timeout(domain);
-	}
+	calc_new_online_timeout(domain);
 
 	domain->check_online_event = add_timed_event( NULL,
 						timeval_current_ofs(domain->check_online_timeout,0),

Modified: branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c
===================================================================
--- branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c	2006-12-06 23:14:15 UTC (rev 20057)
+++ branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c	2006-12-07 00:08:10 UTC (rev 20058)
@@ -171,9 +171,7 @@
 	/* If we're in statup mode, check again in 10 seconds, not in
 	   lp_winbind_cache_time() seconds (which is 5 mins by default). */
 
-	if (domain->check_online_timeout == 0) {
-		calc_new_online_timeout(domain);
-	}
+	calc_new_online_timeout(domain);
 
 	domain->check_online_event = add_timed_event( NULL,
 						timeval_current_ofs(domain->check_online_timeout,0),