diff options
| author | Volker Lendecke <vl@samba.org> | 2014-03-20 14:36:11 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-03-21 19:20:17 +0100 |
| commit | a699f0e0a6d1c3582a5d8f5361e5c32b46629451 (patch) | |
| tree | da40e3d92a45796a657509725bb8b0eb0e7e4381 | |
| parent | cfa6fe8d6974c35cc50aef2f6cdbbbd9b513e483 (diff) | |
| download | samba-a699f0e0a6d1c3582a5d8f5361e5c32b46629451.tar.gz samba-a699f0e0a6d1c3582a5d8f5361e5c32b46629451.tar.xz samba-a699f0e0a6d1c3582a5d8f5361e5c32b46629451.zip | |
smbd: Explicitly pass "file_id" to rename_open_files
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | source3/smbd/reply.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index b189d667be..a66aa5a6db 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -6101,6 +6101,7 @@ static bool resolve_wildcards(TALLOC_CTX *ctx, static void rename_open_files(connection_struct *conn, struct share_mode_lock *lck, + struct file_id id, uint32_t orig_name_hash, const struct smb_filename *smb_fname_dst) { @@ -6109,7 +6110,7 @@ static void rename_open_files(connection_struct *conn, NTSTATUS status; uint32_t new_name_hash = 0; - for(fsp = file_find_di_first(conn->sconn, lck->data->id); fsp; + for(fsp = file_find_di_first(conn->sconn, id); fsp; fsp = file_find_di_next(fsp)) { /* fsp_name is a relative path under the fsp. To change this for other sharepaths we need to manipulate relative paths. */ @@ -6135,7 +6136,7 @@ static void rename_open_files(connection_struct *conn, if (!did_rename) { DEBUG(10, ("rename_open_files: no open files on file_id %s " - "for %s\n", file_id_string_tos(&lck->data->id), + "for %s\n", file_id_string_tos(&id), smb_fname_str_dbg(smb_fname_dst))); } @@ -6498,7 +6499,8 @@ NTSTATUS rename_internals_fsp(connection_struct *conn, notify_rename(conn, fsp->is_directory, fsp->fsp_name, smb_fname_dst); - rename_open_files(conn, lck, fsp->name_hash, smb_fname_dst); + rename_open_files(conn, lck, fsp->file_id, fsp->name_hash, + smb_fname_dst); /* * A rename acts as a new file create w.r.t. allowing an initial delete |