Merge branch 'master' of ssh://git.samba.org/data/git/samba into arc4

[kai/samba.git] / source4 / smbd / process_thread.c

diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c
index 5a45cdfeac6e6bee2977007031f1abcf1393190a..597cf587f13f7406980dc80b07e91a3e5b8a9cc4 100644 (file)
--- a/source4/smbd/process_thread.c
+++ b/source4/smbd/process_thread.c
@@ -77,7 +77,7 @@ static void thread_accept_connection(struct event_context *ev,
        struct new_conn_state *state;
        struct event_context *ev2;
 
-       ev2 = event_context_init(ev);
+       ev2 = s4_event_context_init(ev);
        if (ev2 == NULL) return;
 
        state = talloc(ev2, struct new_conn_state);
@@ -160,7 +160,7 @@ static void thread_new_task(struct event_context *ev,
        struct new_task_state *state;
        struct event_context *ev2;
 
-       ev2 = event_context_init(ev);
+       ev2 = s4_event_context_init(ev);
        if (ev2 == NULL) return;
 
        state = talloc(ev2, struct new_task_state);
@@ -188,7 +188,7 @@ static void thread_new_task(struct event_context *ev,
 }
 
 /* called when a task goes down */
-static void thread_terminate(struct event_context *event_ctx, const char *reason) 
+static void thread_terminate(struct event_context *event_ctx, struct loadparm_context *lp_ctx, const char *reason) 
 {
        DEBUG(10,("thread_terminate: reason[%s]\n",reason));