From: Ralph Boehme <slow@samba.org>
Date: Thu, 30 Apr 2020 15:20:49 +0000 (+0200)
Subject: smbd: realign args of get_real_filename() and friends
X-Git-Tag: ldb-2.2.0~691
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=09b841aa1ca667c336a1dbabe66ac70dd0cbe388;p=thirdparty%2Fsamba.git

smbd: realign args of get_real_filename() and friends

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

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 25f898abc82..06a37fd6b01 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -1652,8 +1652,10 @@ static int get_real_filename_full_scan(connection_struct *conn,
  fallback.
 ****************************************************************************/
 
-int get_real_filename(connection_struct *conn, const char *path,
-		      const char *name, TALLOC_CTX *mem_ctx,
+int get_real_filename(connection_struct *conn,
+		      const char *path,
+		      const char *name,
+		      TALLOC_CTX *mem_ctx,
 		      char **found_name)
 {
 	int ret;
@@ -1667,12 +1669,20 @@ int get_real_filename(connection_struct *conn, const char *path,
 	mangled = mangle_is_mangled(name, conn->params);
 
 	if (mangled) {
-		return get_real_filename_full_scan(conn, path, name, mangled,
-						   mem_ctx, found_name);
+		return get_real_filename_full_scan(conn,
+						   path,
+						   name,
+						   mangled,
+						   mem_ctx,
+						   found_name);
 	}
 
 	/* Try the vfs first to take advantage of case-insensitive stat. */
-	ret = SMB_VFS_GET_REAL_FILENAME(conn, path, name, mem_ctx, found_name);
+	ret = SMB_VFS_GET_REAL_FILENAME(conn,
+					path,
+					name,
+					mem_ctx,
+					found_name);
 
 	/*
 	 * If the case-insensitive stat was successful, or returned an error
@@ -1683,7 +1693,11 @@ int get_real_filename(connection_struct *conn, const char *path,
 		return ret;
 	}
 
-	return get_real_filename_full_scan(conn, path, name, mangled, mem_ctx,
+	return get_real_filename_full_scan(conn,
+					   path,
+					   name,
+					   mangled,
+					   mem_ctx,
 					   found_name);
 }
 
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 2dd469a6213..a611b151215 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -367,8 +367,10 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
 		      uint32_t ucf_flags);
 NTSTATUS check_name(connection_struct *conn,
 			const struct smb_filename *smb_fname);
-int get_real_filename(connection_struct *conn, const char *path,
-		      const char *name, TALLOC_CTX *mem_ctx,
+int get_real_filename(connection_struct *conn,
+		      const char *path,
+		      const char *name,
+		      TALLOC_CTX *mem_ctx,
 		      char **found_name);
 char *get_original_lcomp(TALLOC_CTX *ctx,
 			connection_struct *conn,