r20623: change where the smb.conf parm event:backend is checked to ensure it
authorAndrew Tridgell <tridge@samba.org>
Tue, 9 Jan 2007 03:52:07 +0000 (03:52 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 19:37:16 +0000 (14:37 -0500)
affects all event_context_init() calls

source/lib/events/events.c

index 11f85b1c6e9f5c2b262f7bdc460ffeaaf4a29d7c..6159ea147f152417dcece058ebb7d7c2c766971c 100644 (file)
@@ -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