svn commit: samba r20623 - in branches/SAMBA_4_0/source/lib/events: .

[tridge at samba.org]

Author: tridge
Date: 2007-01-09 03:52:07 +0000 (Tue, 09 Jan 2007)
New Revision: 20623

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

Log:

change where the smb.conf parm event:backend is checked to ensure it
affects all event_context_init() calls

Modified:
   branches/SAMBA_4_0/source/lib/events/events.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/events/events.c
===================================================================
--- branches/SAMBA_4_0/source/lib/events/events.c	2007-01-09 03:45:50 UTC (rev 20622)
+++ branches/SAMBA_4_0/source/lib/events/events.c	2007-01-09 03:52:07 UTC (rev 20623)
@@ -157,7 +157,12 @@
 
 	event_backend_init();
 
+#if _SAMBA_BUILD_
 	if (name == NULL) {
+		name = lp_parm_string(-1, "event", "backend");
+	}
+#endif
+	if (name == NULL) {
 		name = "standard";
 	}
 
@@ -250,7 +255,6 @@
 	return ev->ops->loop_wait(ev);
 }
 
-#if _SAMBA_BUILD_
 /*
   find an event context that is a parent of the given memory context,
   or create a new event context as a child of the given context if
@@ -264,9 +268,7 @@
 {
 	struct event_context *ev = talloc_find_parent_bytype(mem_ctx, struct event_context);
 	if (ev == NULL) {		
-		ev = event_context_init_byname(mem_ctx, 
-					       lp_parm_string(-1, "event", "backend"));
+		ev = event_context_init(mem_ctx);
 	}
 	return ev;
 }
-#endif