svn commit: samba r20915 - in branches/SAMBA_3_0/source/nsswitch: .

jra at samba.org jra at samba.org
Fri Jan 19 21:29:46 GMT 2007


Author: jra
Date: 2007-01-19 21:29:46 +0000 (Fri, 19 Jan 2007)
New Revision: 20915

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

Log:
Fixed the bad merge from 3.0.24.
Jeremy.

Modified:
   branches/SAMBA_3_0/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	2007-01-19 20:05:02 UTC (rev 20914)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2007-01-19 21:29:46 UTC (rev 20915)
@@ -328,7 +328,8 @@
 
 	calc_new_online_timeout_check(domain);
 
-	domain->check_online_event = event_add_timed(winbind_event_context(), NULL,
+	domain->check_online_event = event_add_timed(winbind_event_context(),
+						NULL,
 						timeval_current_ofs(domain->check_online_timeout,0),
 						"check_domain_online_handler",
 						check_domain_online_handler,
@@ -434,11 +435,12 @@
 		DEBUG(10,("set_domain_online_request: domain %s was globally offline.\n",
 			domain->name ));
 
-		domain->check_online_event = event_add_timed(
-			winbind_event_context(), NULL, tev,
-			"check_domain_online_handler",
-			check_domain_online_handler,
-			domain);
+		domain->check_online_event = event_add_timed(winbind_event_context(),
+								NULL,
+								timeval_current_ofs(5, 0),
+								"check_domain_online_handler",
+								check_domain_online_handler,
+								domain);
 
 		/* The above *has* to succeed for winbindd to work. */
 		if (!domain->check_online_event) {



More information about the samba-cvs mailing list