From: Ralph Boehme <slow@samba.org>
Date: Fri, 8 May 2020 13:46:02 +0000 (+0200)
Subject: smbd: remove redundant conn arg from non_widelink_open()
X-Git-Tag: ldb-2.2.0~409
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d708d002d7d9f4aa630180857caaf027442fcd9b;p=thirdparty%2Fsamba.git

smbd: remove redundant conn arg from non_widelink_open()

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

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Thu May 21 06:43:04 UTC 2020 on sn-devel-184
---

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index adcc2490a67..e4628a75e72 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -459,8 +459,7 @@ static int link_errno_convert(int err)
 	return err;
 }
 
-static int non_widelink_open(struct connection_struct *conn,
-			files_struct *fsp,
+static int non_widelink_open(files_struct *fsp,
 			struct smb_filename *smb_fname,
 			int flags,
 			mode_t mode,
@@ -590,8 +589,7 @@ static int process_symlink_open(struct connection_struct *conn,
 	}
 
 	/* And do it all again.. */
-	fd = non_widelink_open(conn,
-				fsp,
+	fd = non_widelink_open(fsp,
 				smb_fname,
 				flags,
 				mode,
@@ -621,13 +619,13 @@ static int process_symlink_open(struct connection_struct *conn,
  Non-widelink open.
 ****************************************************************************/
 
-static int non_widelink_open(struct connection_struct *conn,
-			     files_struct *fsp,
+static int non_widelink_open(files_struct *fsp,
 			     struct smb_filename *smb_fname,
 			     int flags,
 			     mode_t mode,
 			     unsigned int link_depth)
 {
+	struct connection_struct *conn = fsp->conn;
 	NTSTATUS status;
 	int fd = -1;
 	struct smb_filename *smb_fname_rel = NULL;
@@ -781,12 +779,11 @@ NTSTATUS fd_open(files_struct *fsp,
 	 * Only follow symlinks within a share
 	 * definition.
 	 */
-	fsp->fh->fd = non_widelink_open(conn,
-				fsp,
-				smb_fname,
-				flags,
-				mode,
-				0);
+	fsp->fh->fd = non_widelink_open(fsp,
+					smb_fname,
+					flags,
+					mode,
+					0);
 	if (fsp->fh->fd == -1) {
 		saved_errno = errno;
 	}