summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2007-01-09 03:52:07 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:37:16 -0500
commit2ed11961292c928be5166b1774e05676bbfabce8 (patch)
tree96b432d73523c09b0fa2620b67d4ada2c23e695d /source4
parent08439c72c494565669bdd260050d061a005e89fe (diff)
downloadsamba-2ed11961292c928be5166b1774e05676bbfabce8.tar.gz
samba-2ed11961292c928be5166b1774e05676bbfabce8.tar.bz2
samba-2ed11961292c928be5166b1774e05676bbfabce8.zip
r20623: change where the smb.conf parm event:backend is checked to ensure it
affects all event_context_init() calls (This used to be commit 803e6cf6ef5caaf7c9faefcc111c97e1a97e9b82)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/events/events.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/lib/events/events.c b/source4/lib/events/events.c
index 11f85b1c6e..6159ea147f 100644
--- a/source4/lib/events/events.c
+++ b/source4/lib/events/events.c
@@ -157,6 +157,11 @@ struct event_context *event_context_init_byname(TALLOC_CTX *mem_ctx, const char
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 @@ int event_loop_wait(struct event_context *ev)
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 *event_context_find(TALLOC_CTX *mem_ctx)
{
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