From: Jeremy Allison <jra@samba.org>
Date: Thu, 13 Jun 2019 23:17:49 +0000 (-0700)
Subject: s3: smbd: Now we always have a handle in smb_set_posix_acl(), use it instead of smb_f... 
X-Git-Tag: ldb-2.0.5~244
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72605195010b8941c28d587079e994cb5c434b17;p=thirdparty%2Fsamba.git

s3: smbd: Now we always have a handle in smb_set_posix_acl(), use it instead of smb_fname.

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

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index bcb40b3ccba..b87efc6d983 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -7375,14 +7375,14 @@ static NTSTATUS smb_set_posix_acl(connection_struct *conn,
 	/* Here we know fsp != NULL */
 	SMB_ASSERT(fsp != NULL);
 
-	status = refuse_symlink(conn, fsp, smb_fname);
+	status = refuse_symlink(conn, fsp, fsp->fsp_name);
 	if (!NT_STATUS_IS_OK(status)) {
 		goto out;
 	}
 
 	DBG_DEBUG("file %s num_file_acls = %"PRIu16", "
 		  "num_def_acls = %"PRIu16"\n",
-		  smb_fname ? smb_fname_str_dbg(smb_fname) : fsp_str_dbg(fsp),
+		  fsp_str_dbg(fsp),
 		  num_file_acls,
 		  num_def_acls);
 
@@ -7392,7 +7392,7 @@ static NTSTATUS smb_set_posix_acl(connection_struct *conn,
 	if (valid_file_acls) {
 		bool ok = set_unix_posix_acl(conn,
 					fsp,
-					smb_fname,
+					fsp->fsp_name,
 					num_file_acls,
 					pdata);
 		if (!ok) {
@@ -7406,7 +7406,7 @@ static NTSTATUS smb_set_posix_acl(connection_struct *conn,
 
 	if (valid_def_acls) {
 		bool ok = set_unix_posix_default_acl(conn,
-					smb_fname,
+					fsp->fsp_name,
 					num_def_acls,
 					pdata);
 		if (!ok) {