torture:smb2:replay: extend CHECK_CREATE_OUT() to know leases

[samba.git] / source4 / smbd / service_task.c

diff --git a/source4/smbd/service_task.c b/source4/smbd/service_task.c
index 68aba690197e3a8e6c581e7ef1c8a9714e433dbb..7422f2c3e9be2bb21af402ebf80dd32c5cb662e8 100644 (file)
--- a/source4/smbd/service_task.c
+++ b/source4/smbd/service_task.c
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,25 +16,44 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "process_model.h"
-#include "lib/events/events.h"
-#include "smbd/service_task.h"
+#include "lib/messaging/irpc.h"
+#include "param/param.h"
+#include "librpc/gen_ndr/ndr_irpc_c.h"
 
 /*
   terminate a task service
 */
-void task_terminate(struct task_server *task, const char *reason)
+void task_server_terminate(struct task_server *task, const char *reason, bool fatal)
 {
-       struct event_context *event_ctx = task->event_ctx;
+       struct tevent_context *event_ctx = task->event_ctx;
        const struct model_ops *model_ops = task->model_ops;
-       DEBUG(0,("task_terminate: [%s]\n", reason));
+       DEBUG(0,("task_server_terminate: [%s]\n", reason));
+
+       if (fatal && task->msg_ctx != NULL) {
+               struct dcerpc_binding_handle *irpc_handle;
+               struct samba_terminate r;
+
+               irpc_handle = irpc_binding_handle_by_name(task, task->msg_ctx,
+                                                         "samba", &ndr_table_irpc);
+               if (irpc_handle != NULL) {
+                       /* Note: this makes use of nested event loops... */
+                       dcerpc_binding_handle_set_sync_ev(irpc_handle, event_ctx);
+                       r.in.reason = reason;
+                       dcerpc_samba_terminate_r(irpc_handle, task, &r);
+               }
+       }
+
+       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 */
        talloc_free(task);
-       model_ops->terminate(event_ctx, reason);
 }
 
 /* used for the callback from the process model code */
@@ -48,9 +67,11 @@ struct task_state {
   called by the process model code when the new task starts up. This then calls
   the server specific startup code
 */
-static void task_server_callback(struct event_context *event_ctx, uint32_t server_id, void *private)
+static void task_server_callback(struct tevent_context *event_ctx, 
+                                struct loadparm_context *lp_ctx,
+                                struct server_id server_id, void *private_data)
 {
-       struct task_state *state = talloc_get_type(private, struct task_state);
+       struct task_state *state = talloc_get_type(private_data, struct task_state);
        struct task_server *task;
 
        task = talloc(event_ctx, struct task_server);
@@ -59,10 +80,14 @@ static void task_server_callback(struct event_context *event_ctx, uint32_t serve
        task->event_ctx = event_ctx;
        task->model_ops = state->model_ops;
        task->server_id = server_id;
+       task->lp_ctx = lp_ctx;
 
-       task->msg_ctx = messaging_init(task, 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_terminate(task, "messaging_init() failed");
+               task_server_terminate(task, "imessaging_init() failed", true);
                return;
        }
 
@@ -72,7 +97,9 @@ static void task_server_callback(struct event_context *event_ctx, uint32_t serve
 /*
   startup a task based server
 */
-NTSTATUS task_server_startup(struct event_context *event_ctx, 
+NTSTATUS task_server_startup(struct tevent_context *event_ctx, 
+                            struct loadparm_context *lp_ctx,
+                            const char *service_name, 
                             const struct model_ops *model_ops, 
                             void (*task_init)(struct task_server *))
 {
@@ -84,8 +111,15 @@ NTSTATUS task_server_startup(struct event_context *event_ctx,
        state->task_init = task_init;
        state->model_ops = model_ops;
        
-       model_ops->new_task(event_ctx, task_server_callback, state);
+       model_ops->new_task(event_ctx, lp_ctx, service_name, task_server_callback, state);
 
        return NT_STATUS_OK;
 }
 
+/*
+  setup a task title 
+*/
+void task_server_set_title(struct task_server *task, const char *title)
+{
+       task->model_ops->set_title(task->event_ctx, title);
+}