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

[jra at samba.org]

Author: jra
Date: 2007-01-19 20:05:02 +0000 (Fri, 19 Jan 2007)
New Revision: 20914

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

Log:
Sync up incorrect differences between 3.0.24 and 3.0
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:00:44 UTC (rev 20913)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c	2007-01-19 20:05:02 UTC (rev 20914)
@@ -434,10 +434,18 @@
 		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);
+
+		/* The above *has* to succeed for winbindd to work. */
+		if (!domain->check_online_event) {
+			smb_panic("set_domain_online_request: failed to add online handler.\n");
+		}
 	}
 
-	TALLOC_FREE(domain->check_online_event);
-
 	GetTimeOfDay(&tev);
 
 	/* Go into "startup" mode again. */
@@ -446,16 +454,7 @@
 
 	tev.tv_sec += 5;
 
-	domain->check_online_event = event_add_timed(
-		winbind_event_context(), NULL, tev,
-		"check_domain_online_handler",
-		check_domain_online_handler,
-		domain);
-
-	/* The above *has* to succeed for winbindd to work. */
-	if (!domain->check_online_event) {
-		smb_panic("set_domain_online_request: failed to add online handler.\n");
-	}
+	set_event_dispatch_time(winbind_event_context(), "check_domain_online_handler", tev);
 }
 
 /****************************************************************