s3:smbd/conn_msg: pass smbd_server_connection as private_data to msg_force_tdis()
authorStefan Metzmacher <metze@samba.org>
Tue, 13 Dec 2011 07:11:58 +0000 (08:11 +0100)
committerStefan Metzmacher <metze@samba.org>
Tue, 13 Dec 2011 11:36:35 +0000 (12:36 +0100)
metze

source3/smbd/conn_msg.c
source3/smbd/process.c

index b0c968a68073bb9d2ef34b68b317363788ba13ad..96171e2aa1c9a2c1c6740ef03535caa9ff769624 100644 (file)
@@ -36,12 +36,12 @@ void msg_force_tdis(struct messaging_context *msg,
                    struct server_id server_id,
                    DATA_BLOB *data)
 {
-       struct smbd_server_connection *sconn;
        const char *sharename = (const char *)data->data;
+       struct smbd_server_connection *sconn =
+               talloc_get_type(private_data,
+               struct smbd_server_connection);
 
-       sconn = msg_ctx_to_sconn(msg);
        if (sconn == NULL) {
-               DEBUG(1, ("could not find sconn\n"));
                return;
        }
 
index 3b3c1040cec0f8cc1eba6fb1d6a1f0c9afa73319..cb04cea3e2f6d5c4087956992b0f5123b82843b9 100644 (file)
@@ -3135,7 +3135,7 @@ void smbd_process(struct tevent_context *ev_ctx,
                exit_server("Failed to init oplocks");
 
        /* register our message handlers */
-       messaging_register(sconn->msg_ctx, NULL,
+       messaging_register(sconn->msg_ctx, sconn,
                           MSG_SMB_FORCE_TDIS, msg_force_tdis);
        messaging_register(sconn->msg_ctx, sconn,
                           MSG_SMB_CLOSE_FILE, msg_close_file);