s3:smbd/clode: pass smbd_server_connection as private_data to msg_close_file()
authorStefan Metzmacher <metze@samba.org>
Mon, 12 Dec 2011 14:45:07 +0000 (15:45 +0100)
committerStefan Metzmacher <metze@samba.org>
Mon, 12 Dec 2011 19:14:41 +0000 (20:14 +0100)
metze

source3/smbd/close.c
source3/smbd/process.c

index 8fd6b1f5218a6be1283e334beeb2158af3eebb98..df7e156fe5c781edd5fe36d6cd75e86c335f5f6e 100644 (file)
@@ -1138,13 +1138,13 @@ void msg_close_file(struct messaging_context *msg_ctx,
                        struct server_id server_id,
                        DATA_BLOB *data)
 {
-       struct smbd_server_connection *sconn;
        files_struct *fsp = NULL;
        struct share_mode_entry e;
+       struct smbd_server_connection *sconn =
+               talloc_get_type(private_data,
+               struct smbd_server_connection);
 
-       sconn = msg_ctx_to_sconn(msg_ctx);
        if (sconn == NULL) {
-               DEBUG(1, ("could not find sconn\n"));
                return;
        }
 
index 64dec5291c669d14a1197a546a5212b82cf66f39..0d17ad7f8cedd8c9f37cd997e96b11632c60d614 100644 (file)
@@ -3137,7 +3137,7 @@ void smbd_process(struct tevent_context *ev_ctx,
        /* register our message handlers */
        messaging_register(sconn->msg_ctx, NULL,
                           MSG_SMB_FORCE_TDIS, msg_force_tdis);
-       messaging_register(sconn->msg_ctx, NULL,
+       messaging_register(sconn->msg_ctx, sconn,
                           MSG_SMB_CLOSE_FILE, msg_close_file);
 
        /*