s3: smbd: Now we always have a handle in smb_set_posix_acl(), use it instead of smb_f...
authorJeremy Allison <jra@samba.org>
Thu, 13 Jun 2019 23:17:49 +0000 (16:17 -0700)
committerJeremy Allison <jra@samba.org>
Mon, 24 Jun 2019 18:49:09 +0000 (18:49 +0000)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
source3/smbd/trans2.c

index bcb40b3ccba5bee7776345c985b44c474fe2090a..b87efc6d983a3750bf13533921f4aab8e1c38ea2 100644 (file)
@@ -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) {