selftest/Samba4: make use of get_cmd_env_vars() to setup all relevant env variables

[samba.git] / source3 / modules / vfs_linux_xfs_sgid.c

diff --git a/source3/modules/vfs_linux_xfs_sgid.c b/source3/modules/vfs_linux_xfs_sgid.c
index e55734f806faea690b89ff9f2b07b86cd98b22fb..a08e2d40f831d099eabe24828c5488e1d0816cff 100644 (file)
--- a/source3/modules/vfs_linux_xfs_sgid.c
+++ b/source3/modules/vfs_linux_xfs_sgid.c
@@ -31,7 +31,7 @@ static int linux_xfs_sgid_mkdirat(vfs_handle_struct *handle,
        struct smb_filename *fname = NULL;
        int mkdir_res;
        int res;
-       bool ok;
+       NTSTATUS status;
 
        DEBUG(10, ("Calling linux_xfs_sgid_mkdirat(%s)\n",
                smb_fname->base_name));
@@ -53,9 +53,14 @@ static int linux_xfs_sgid_mkdirat(vfs_handle_struct *handle,
                return -1;
        }
 
-       ok = parent_smb_fname(talloc_tos(), fname, &dname, NULL);
-       if (!ok) {
-               DBG_WARNING("parent_smb_fname() failed\n");
+       status = SMB_VFS_PARENT_PATHNAME(handle->conn,
+                                        talloc_tos(),
+                                        fname,
+                                        &dname,
+                                        NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               DBG_WARNING("SMB_VFS_PARENT_PATHNAME() failed with %s\n",
+                       nt_errstr(status));
                /* return success, we did the mkdir */
                return mkdir_res;
        }
@@ -94,7 +99,7 @@ static int linux_xfs_sgid_mkdirat(vfs_handle_struct *handle,
         * return success. What can you do...
         */
        become_root();
-       res = SMB_VFS_NEXT_CHMOD(handle, fname, fname->st.st_ex_mode);
+       res = SMB_VFS_NEXT_FCHMOD(handle, smb_fname->fsp, fname->st.st_ex_mode);
        unbecome_root();
 
        if (res == -1) {