diff options
author | Volker Lendecke <vl@samba.org> | 2019-11-04 07:39:48 +0100 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2019-11-06 20:36:35 +0000 |
commit | d04581bfe926013bda2df2beefd836555e53e8f9 (patch) | |
tree | 2f957574de2c0c17e652528c97e69a26fd9731b6 /source3 | |
parent | 1bbdae2234487393e4a964d59b4d772a8a758eff (diff) | |
download | samba-d04581bfe926013bda2df2beefd836555e53e8f9.tar.gz |
smbd: Use file_id_str_buf() in rename_open_files()
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
-rw-r--r-- | source3/smbd/reply.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 98f5e1c27f6..6c71b57e046 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -6768,6 +6768,7 @@ static void rename_open_files(connection_struct *conn, for(fsp = file_find_di_first(conn->sconn, id); fsp; fsp = file_find_di_next(fsp)) { + struct file_id_buf idbuf; /* fsp_name is a relative path under the fsp. To change this for other sharepaths we need to manipulate relative paths. */ /* TODO - create the absolute path and manipulate the newname @@ -6778,10 +6779,12 @@ static void rename_open_files(connection_struct *conn, if (fsp->name_hash != orig_name_hash) { continue; } - DEBUG(10, ("rename_open_files: renaming file %s " - "(file_id %s) from %s -> %s\n", fsp_fnum_dbg(fsp), - file_id_string_tos(&fsp->file_id), fsp_str_dbg(fsp), - smb_fname_str_dbg(smb_fname_dst))); + DBG_DEBUG("renaming file %s " + "(file_id %s) from %s -> %s\n", + fsp_fnum_dbg(fsp), + file_id_str_buf(fsp->file_id, &idbuf), + fsp_str_dbg(fsp), + smb_fname_str_dbg(smb_fname_dst)); status = fsp_set_smb_fname(fsp, smb_fname_dst); if (NT_STATUS_IS_OK(status)) { @@ -6791,9 +6794,11 @@ 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(&id), - smb_fname_str_dbg(smb_fname_dst))); + struct file_id_buf idbuf; + DBG_DEBUG("no open files on file_id %s " + "for %s\n", + file_id_str_buf(id, &idbuf), + smb_fname_str_dbg(smb_fname_dst)); } /* Send messages to all smbd's (not ourself) that the name has changed. */ |