Merge tag 'upstream/4.0.5+dfsg1' into samba_4.0_ivo

[abartlet/samba-debian.git] / source4 / smbd / service_task.c

diff --git a/source4/smbd/service_task.c b/source4/smbd/service_task.c
index 1eb8403e3b1fa41ecbb35d193012905091e6ea6e..5d14fafec0437854270aaaff0fb83c90db3c9a6a 100644 (file)
--- a/source4/smbd/service_task.c
+++ b/source4/smbd/service_task.c
@@ -34,7 +34,7 @@ void task_server_terminate(struct task_server *task, const char *reason, bool fa
        const struct model_ops *model_ops = task->model_ops;
        DEBUG(0,("task_server_terminate: [%s]\n", reason));
 
-       if (fatal) {
+       if (fatal && task->msg_ctx != NULL) {
                struct dcerpc_binding_handle *irpc_handle;
                struct samba_terminate r;
 
@@ -46,6 +46,8 @@ void task_server_terminate(struct task_server *task, const char *reason, bool fa
                }
        }
 
+       imessaging_cleanup(task->msg_ctx);
+
        model_ops->terminate(event_ctx, task->lp_ctx, reason);
        
        /* don't free this above, it might contain the 'reason' being printed */
@@ -78,12 +80,12 @@ static void task_server_callback(struct tevent_context *event_ctx,
        task->server_id = server_id;
        task->lp_ctx = lp_ctx;
 
-       task->msg_ctx = messaging_init(task, 
-                                      lpcfg_messaging_path(task, task->lp_ctx),
-                                      task->server_id, 
-                                      task->event_ctx);
+       task->msg_ctx = imessaging_init(task,
+                                       task->lp_ctx,
+                                       task->server_id,
+                                       task->event_ctx, false);
        if (!task->msg_ctx) {
-               task_server_terminate(task, "messaging_init() failed", true);
+               task_server_terminate(task, "imessaging_init() failed", true);
                return;
        }