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

jra at samba.org jra at samba.org
Wed Dec 13 01:11:30 GMT 2006


Author: jra
Date: 2006-12-13 01:11:29 +0000 (Wed, 13 Dec 2006)
New Revision: 20146

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

Log:
Now online checks are fully async we can do them
every cache timeout times.
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-12 23:48:28 UTC (rev 20145)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2006-12-13 01:11:29 UTC (rev 20146)
@@ -271,7 +271,7 @@
 }
 
 /****************************************************************
- If we're still offline, exponentially increase the timeout check.
+ If we're still offline setup the timeout check.
 ****************************************************************/
 
 static void calc_new_online_timeout_check(struct winbindd_domain *domain)
@@ -282,12 +282,6 @@
 		domain->check_online_timeout = 10;
 	} else if (domain->check_online_timeout < wbc) {
 		domain->check_online_timeout = wbc;
-	} else {
-		uint32 new_to = domain->check_online_timeout * 3;
-		if (new_to > (3*60*60)) {
-			new_to = 3*60*60; /* 3 hours. */
-		}
-		domain->check_online_timeout = new_to;
 	}
 }
 

Modified: branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c
===================================================================
--- branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c	2006-12-12 23:48:28 UTC (rev 20145)
+++ branches/SAMBA_3_0_24/source/nsswitch/winbindd_cm.c	2006-12-13 01:11:29 UTC (rev 20146)
@@ -269,7 +269,7 @@
 }
 
 /****************************************************************
- If we're still offline, exponentially increase the timeout check.
+ If we're still offline setup the timeout check.
 ****************************************************************/
 
 static void calc_new_online_timeout_check(struct winbindd_domain *domain)
@@ -280,12 +280,6 @@
 		domain->check_online_timeout = 10;
 	} else if (domain->check_online_timeout < wbc) {
 		domain->check_online_timeout = wbc;
-	} else {
-		uint32 new_to = domain->check_online_timeout * 3;
-		if (new_to > (3*60*60)) {
-			new_to = 3*60*60; /* 3 hours. */
-		}
-		domain->check_online_timeout = new_to;
 	}
 }
 



More information about the samba-cvs mailing list