From db607331d353dc43e1a7cb11e7af0ce7e38faf9a Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 3 Oct 2010 17:34:43 +0200 Subject: s3: Remove smbd_server_conn from msg_file_was_renamed --- source3/smbd/open.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source3/smbd') diff --git a/source3/smbd/open.c b/source3/smbd/open.c index d7927b7502..d3953319fe 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -2734,6 +2734,7 @@ void msg_file_was_renamed(struct messaging_context *msg, struct server_id server_id, DATA_BLOB *data) { + struct smbd_server_connection *sconn; files_struct *fsp; char *frm = (char *)data->data; struct file_id id; @@ -2744,6 +2745,12 @@ void msg_file_was_renamed(struct messaging_context *msg, size_t sp_len, bn_len; NTSTATUS status; + sconn = msg_ctx_to_sconn(msg); + if (sconn == NULL) { + DEBUG(1, ("could not find sconn\n")); + return; + } + if (data->data == NULL || data->length < MSG_FILE_RENAMED_MIN_SIZE + 2) { DEBUG(0, ("msg_file_was_renamed: Got invalid msg len %d\n", @@ -2775,7 +2782,7 @@ void msg_file_was_renamed(struct messaging_context *msg, sharepath, smb_fname_str_dbg(smb_fname), file_id_string_tos(&id))); - for(fsp = file_find_di_first(smbd_server_conn, id); fsp; + for(fsp = file_find_di_first(sconn, id); fsp; fsp = file_find_di_next(fsp)) { if (memcmp(fsp->conn->connectpath, sharepath, sp_len) == 0) { -- cgit