smbd: Fix indentation of rename_internals[_fsp] params

Next patches add params

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index ee2d8294a105c7bea32cd27a1968cc67cf4542e6..3687f1132d0c3f123fa1991f847fd7566d57110a 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -940,22 +940,22 @@ ssize_t sendfile_short_send(struct smbXsrv_connection *xconn,
                            size_t headersize,
                            size_t smb_maxcnt);
 NTSTATUS rename_internals_fsp(connection_struct *conn,
-                       files_struct *fsp,
-                       struct share_mode_lock **lck,
-                       struct smb_filename *smb_fname_dst_in,
-                       const char *dst_original_lcomp,
-                       uint32_t attrs,
-                       bool replace_if_exists);
+                             files_struct *fsp,
+                             struct share_mode_lock **lck,
+                             struct smb_filename *smb_fname_dst_in,
+                             const char *dst_original_lcomp,
+                             uint32_t attrs,
+                             bool replace_if_exists);
 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 smb_filename *smb_fname_dst,
-                       const char *dst_original_lcomp,
-                       uint32_t attrs,
-                       bool replace_if_exists,
-                       uint32_t access_mask);
+                         connection_struct *conn,
+                         struct smb_request *req,
+                         struct files_struct *src_dirfsp,
+                         struct smb_filename *smb_fname_src,
+                         struct smb_filename *smb_fname_dst,
+                         const char *dst_original_lcomp,
+                         uint32_t attrs,
+                         bool replace_if_exists,
+                         uint32_t access_mask);
 NTSTATUS copy_file(TALLOC_CTX *ctx,
                        connection_struct *conn,
                        struct smb_filename *smb_fname_src,

diff --git a/source3/smbd/smb1_reply.c b/source3/smbd/smb1_reply.c
index aff33a3501cd429b46adf294de8b1e63166a2990..dc4e2533c5da5044e9cc11e044537e4b1211be01 100644 (file)
--- a/source3/smbd/smb1_reply.c
+++ b/source3/smbd/smb1_reply.c
@@ -6466,15 +6466,15 @@ void reply_mv(struct smb_request *req)
                   smb_fname_str_dbg(smb_fname_dst));
 
        status = rename_internals(ctx,
-                               conn,
-                               req,
-                               src_dirfsp, /* src_dirfsp */
-                               smb_fname_src,
-                               smb_fname_dst,
-                               dst_original_lcomp,
-                               attrs,
-                               false,
-                               DELETE_ACCESS);
+                                 conn,
+                                 req,
+                                 src_dirfsp, /* src_dirfsp */
+                                 smb_fname_src,
+                                 smb_fname_dst,
+                                 dst_original_lcomp,
+                                 attrs,
+                                 false,
+                                 DELETE_ACCESS);
        if (!NT_STATUS_IS_OK(status)) {
                if (open_was_deferred(req->xconn, req->mid)) {
                        /* We have re-scheduled this call. */

diff --git a/source3/smbd/smb2_reply.c b/source3/smbd/smb2_reply.c
index 19f49f89a875a729268c8e371819bc7691ef07a9..786c7c9998b80bd792f037c4e31f946d2ea55574 100644 (file)
--- a/source3/smbd/smb2_reply.c
+++ b/source3/smbd/smb2_reply.c
@@ -1348,12 +1348,12 @@ static void notify_rename(struct connection_struct *conn,
 ****************************************************************************/
 
 NTSTATUS rename_internals_fsp(connection_struct *conn,
-                       files_struct *fsp,
-                       struct share_mode_lock **_lck,
-                       struct smb_filename *smb_fname_dst_in,
-                       const char *dst_original_lcomp,
-                       uint32_t attrs,
-                       bool replace_if_exists)
+                             files_struct *fsp,
+                             struct share_mode_lock **_lck,
+                             struct smb_filename *smb_fname_dst_in,
+                             const char *dst_original_lcomp,
+                             uint32_t attrs,
+                             bool replace_if_exists)
 {
        TALLOC_CTX *ctx = talloc_tos();
        struct smb_filename *parent_dir_fname_dst = NULL;
@@ -1791,15 +1791,15 @@ 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 smb_filename *smb_fname_dst,
-                       const char *dst_original_lcomp,
-                       uint32_t attrs,
-                       bool replace_if_exists,
-                       uint32_t access_mask)
+                         connection_struct *conn,
+                         struct smb_request *req,
+                         struct files_struct *src_dirfsp,
+                         struct smb_filename *smb_fname_src,
+                         struct smb_filename *smb_fname_dst,
+                         const char *dst_original_lcomp,
+                         uint32_t attrs,
+                         bool replace_if_exists,
+                         uint32_t access_mask)
 {
        NTSTATUS status = NT_STATUS_OK;
        int create_options = FILE_OPEN_REPARSE_POINT;
@@ -1892,12 +1892,12 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx,
        }
 
        status = rename_internals_fsp(conn,
-                                       fsp,
-                                       NULL,
-                                       smb_fname_dst,
-                                       dst_original_lcomp,
-                                       attrs,
-                                       replace_if_exists);
+                                     fsp,
+                                     NULL,
+                                     smb_fname_dst,
+                                     dst_original_lcomp,
+                                     attrs,
+                                     replace_if_exists);
 
        close_file_free(req, &fsp, NORMAL_CLOSE);
 

diff --git a/source3/smbd/smb2_trans2.c b/source3/smbd/smb2_trans2.c
index f5d2737e01b2970db9e8c40e076bd54815af0de0..bd9e9d1fedeeea90a9d1239142b3af362b894532 100644 (file)
--- a/source3/smbd/smb2_trans2.c
+++ b/source3/smbd/smb2_trans2.c
@@ -4387,12 +4387,13 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
                  smb_fname_str_dbg(smb_fname_dst));
 
        status = rename_internals_fsp(conn,
-                               fsp,
-                               lck,
-                               smb_fname_dst,
-                               dst_original_lcomp,
-                               (FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM),
-                               overwrite);
+                                     fsp,
+                                     lck,
+                                     smb_fname_dst,
+                                     dst_original_lcomp,
+                                     (FILE_ATTRIBUTE_HIDDEN |
+                                      FILE_ATTRIBUTE_SYSTEM),
+                                     overwrite);
 
        TALLOC_FREE(smb_fname_dst);
        return status;
@@ -4717,26 +4718,26 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
                }
 
                status = rename_internals_fsp(conn,
-                                       fsp,
-                                       NULL,
-                                       smb_fname_dst,
-                                       dst_original_lcomp,
-                                       0,
-                                       overwrite);
+                                             fsp,
+                                             NULL,
+                                             smb_fname_dst,
+                                             dst_original_lcomp,
+                                             0,
+                                             overwrite);
        } else {
                DBG_DEBUG("SMB_FILE_RENAME_INFORMATION %s -> %s\n",
                          smb_fname_str_dbg(smb_fname_src),
                          smb_fname_str_dbg(smb_fname_dst));
                status = rename_internals(ctx,
-                                       conn,
-                                       req,
-                                       NULL, /* src_dirfsp */
-                                       smb_fname_src,
-                                       smb_fname_dst,
-                                       dst_original_lcomp,
-                                       0,
-                                       overwrite,
-                                       FILE_WRITE_ATTRIBUTES);
+                                         conn,
+                                         req,
+                                         NULL, /* src_dirfsp */
+                                         smb_fname_src,
+                                         smb_fname_dst,
+                                         dst_original_lcomp,
+                                         0,
+                                         overwrite,
+                                         FILE_WRITE_ATTRIBUTES);
        }
  out:
        TALLOC_FREE(smb_fname_dst);