s3: smbd: Add src_dirfsp and dst_dirfsp parameters to rename_internals().

Not yet used (but passed to SMB_VFS_CREATE_FILE()).

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 341c98cde71271ba679fd4ba9e989d67452baa7c..f59d3bcac69dea999a7f1f9154232b63898f1c60 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -990,7 +990,9 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
 NTSTATUS rename_internals(TALLOC_CTX *ctx,
                        connection_struct *conn,
                        struct smb_request *req,
+                       struct files_struct *src_dirfsp,
                        struct smb_filename *smb_fname_src,
+                       struct files_struct *dst_dirfsp,
                        struct smb_filename *smb_fname_dst,
                        const char *dst_original_lcomp,
                        uint32_t attrs,

diff --git a/source3/smbd/smb1_nttrans.c b/source3/smbd/smb1_nttrans.c
index 4de7cd45d4e7a874528bf0e23c4f86b40acca445..f07f2b64e4113b2548fd22bb6f11c01808ac6684 100644 (file)
--- a/source3/smbd/smb1_nttrans.c
+++ b/source3/smbd/smb1_nttrans.c
@@ -1537,7 +1537,9 @@ void reply_ntrename(struct smb_request *req)
                        status = rename_internals(ctx,
                                                conn,
                                                req,
+                                               NULL, /* src_dirfsp */
                                                smb_fname_old,
+                                               NULL, /* dst_dirfsp */
                                                smb_fname_new,
                                                dst_original_lcomp,
                                                attrs,

diff --git a/source3/smbd/smb1_reply.c b/source3/smbd/smb1_reply.c
index de38817ea76c00c69a4c2fd4a64bb3fe7a444c62..84196cef829524bfd2ba95c6e0e214ffc7ac78c8 100644 (file)
--- a/source3/smbd/smb1_reply.c
+++ b/source3/smbd/smb1_reply.c
@@ -6085,7 +6085,9 @@ void reply_mv(struct smb_request *req)
        status = rename_internals(ctx,
                                conn,
                                req,
+                               NULL, /* src_dirfsp */
                                smb_fname_src,
+                               NULL, /* dst_dirfsp */
                                smb_fname_dst,
                                dst_original_lcomp,
                                attrs,

diff --git a/source3/smbd/smb2_reply.c b/source3/smbd/smb2_reply.c
index bf9920259582fc1213345b681367e0a2c64525de..52c479589730cb0bf5a4927ab5cd3f1e786f6172 100644 (file)
--- a/source3/smbd/smb2_reply.c
+++ b/source3/smbd/smb2_reply.c
@@ -1718,7 +1718,9 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
 NTSTATUS rename_internals(TALLOC_CTX *ctx,
                        connection_struct *conn,
                        struct smb_request *req,
+                       struct files_struct *src_dirfsp,
                        struct smb_filename *smb_fname_src,
+                       struct files_struct *dst_dirfsp,
                        struct smb_filename *smb_fname_dst,
                        const char *dst_original_lcomp,
                        uint32_t attrs,
@@ -1780,7 +1782,7 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx,
        status = SMB_VFS_CREATE_FILE(
                        conn,                           /* conn */
                        req,                            /* req */
-                       NULL,                           /* dirfsp */
+                       src_dirfsp,                     /* dirfsp */
                        smb_fname_src,                  /* fname */
                        access_mask,                    /* access_mask */
                        (FILE_SHARE_READ |              /* share_access */

diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c
index c1b1626f9f8841042d99093a0fc7a899de26b553..4ac1f95cccea2fd486beca28316f8979cff8f961 100644 (file)
--- a/source3/smbd/smb2_trans2.c
+++ b/source3/smbd/smb2_trans2.c
@@ -5296,7 +5296,9 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
                status = rename_internals(ctx,
                                        conn,
                                        req,
+                                       NULL, /* src_dirfsp */
                                        smb_fname_src,
+                                       NULL, /* dst_dirfsp */
                                        smb_fname_dst,
                                        dst_original_lcomp,
                                        0,