Use fsp->posix_open in preference if we have it.

Jeremy.

diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index 5cd3e215947af7940cde96bc3ac009df8361293a..73dbca4809b00f25e714f2448f5203e75b99b2a4 100644 (file)
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -195,7 +195,7 @@ static NTSTATUS get_acl_blob(TALLOC_CTX *ctx,
        if (fsp && fsp->fh->fd != -1) {
                ret = SMB_VFS_FSTAT(fsp, &sbuf);
        } else {
-               if (lp_posix_pathnames()) {
+               if (fsp->posix_open) {
                        ret = SMB_VFS_LSTAT(handle->conn, name, &sbuf);
                } else {
                        ret = SMB_VFS_STAT(handle->conn, name, &sbuf);
@@ -287,7 +287,7 @@ static NTSTATUS store_acl_blob_fsp(vfs_handle_struct *handle,
        if (fsp->fh->fd != -1) {
                ret = SMB_VFS_FSTAT(fsp, &sbuf);
        } else {
-               if (lp_posix_pathnames()) {
+               if (fsp->posix_open) {
                        ret = SMB_VFS_LSTAT(handle->conn, fsp->fsp_name, &sbuf);
                } else {
                        ret = SMB_VFS_STAT(handle->conn, fsp->fsp_name, &sbuf);
@@ -513,7 +513,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
                if (fsp && !fsp->is_directory && fsp->fh->fd != -1) {
                        ret = SMB_VFS_FSTAT(fsp, &sbuf);
                } else {
-                       if (lp_posix_pathnames()) {
+                       if (fsp->posix_open) {
                                ret = SMB_VFS_LSTAT(handle->conn,fname, &sbuf);
                        } else {
                                ret = SMB_VFS_STAT(handle->conn,fname, &sbuf);
@@ -763,7 +763,7 @@ static NTSTATUS fset_nt_acl_tdb(vfs_handle_struct *handle, files_struct *fsp,
                        return NT_STATUS_OK;
                }
                if (fsp->is_directory || fsp->fh->fd == -1) {
-                       if (lp_posix_pathnames()) {
+                       if (fsp->posix_open) {
                                ret = SMB_VFS_LSTAT(fsp->conn,fsp->fsp_name, &sbuf);
                        } else {
                                ret = SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf);
@@ -893,7 +893,7 @@ static int sys_acl_set_fd_tdb(vfs_handle_struct *handle,
        SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
 
        if (fsp->is_directory || fsp->fh->fd == -1) {
-               if (lp_posix_pathnames()) {
+               if (fsp->posix_open) {
                        ret = SMB_VFS_LSTAT(fsp->conn,fsp->fsp_name, &sbuf);
                } else {
                        ret = SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf);

diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index f46e4683aa4e57869c65563884bd40581a9f1457..039e469426bdc5801248f1dbf66d403cfe7caabd 100644 (file)
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -381,7 +381,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
                if (fsp && !fsp->is_directory && fsp->fh->fd != -1) {
                        ret = SMB_VFS_FSTAT(fsp, &sbuf);
                } else {
-                       if (lp_posix_pathnames()) {
+                       if (fsp->posix_open) {
                                ret = SMB_VFS_LSTAT(handle->conn,fname, &sbuf);
                        } else {
                                ret = SMB_VFS_STAT(handle->conn,fname, &sbuf);
@@ -563,7 +563,7 @@ static NTSTATUS fset_nt_acl_xattr(vfs_handle_struct *handle, files_struct *fsp,
                        return NT_STATUS_OK;
                }
                if (fsp->is_directory || fsp->fh->fd == -1) {
-                       if (lp_posix_pathnames()) {
+                       if (fsp->posix_open) {
                                ret = SMB_VFS_LSTAT(fsp->conn,fsp->fsp_name, &sbuf);
                        } else {
                                ret = SMB_VFS_STAT(fsp->conn,fsp->fsp_name, &sbuf);