s3: smbd: Now we have shown dst_dirfsp is always NULL, remove the parameter from...

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 1b54a86dc540ebbb5893fb05d6fa5d38ffefd310..17d48a757fa05a414150165f25f876bed29a1549 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -982,7 +982,6 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx,
                        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 fe605f4d16def2895891a4f9ef38aa9d6abe1749..82578ae659666df8418298ae21cb78dd86163c50 100644 (file)
--- a/source3/smbd/smb1_nttrans.c
+++ b/source3/smbd/smb1_nttrans.c
@@ -1577,7 +1577,6 @@ void reply_ntrename(struct smb_request *req)
                                                req,
                                                src_dirfsp,
                                                smb_fname_old,
-                                               NULL,
                                                smb_fname_new,
                                                dst_original_lcomp,
                                                attrs,

diff --git a/source3/smbd/smb1_reply.c b/source3/smbd/smb1_reply.c
index fe93c29373515db98731384bfeee7d39498e9ac3..5c2ec449219e359b134a7b788156a3216ed0c5bb 100644 (file)
--- a/source3/smbd/smb1_reply.c
+++ b/source3/smbd/smb1_reply.c
@@ -6481,7 +6481,6 @@ void reply_mv(struct smb_request *req)
                                req,
                                src_dirfsp, /* 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 a8edaa19476b323882107a666e30b4a6b8ddb6eb..ce7f59aa7b9df5133044bb2a81f6af8cc985c404 100644 (file)
--- a/source3/smbd/smb2_reply.c
+++ b/source3/smbd/smb2_reply.c
@@ -1847,7 +1847,6 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx,
                        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/smb2_trans2.c b/source3/smbd/smb2_trans2.c
index 9158b098c44d22ec781f91d4e7c309754fba5f25..377a484eaff5af51486328237afbfabd4c2f996b 100644 (file)
--- a/source3/smbd/smb2_trans2.c
+++ b/source3/smbd/smb2_trans2.c
@@ -4764,7 +4764,6 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
                                        req,
                                        NULL, /* src_dirfsp */
                                        smb_fname_src,
-                                       NULL,
                                        smb_fname_dst,
                                        dst_original_lcomp,
                                        0,