[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5025-g2b5b5be

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  2b5b5bed41320f1890c69c714c7596e1a7a1b964 (commit)
      from  6d5bf226e91eaa7405103f2c32b5d5a310fa35eb (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 2b5b5bed41320f1890c69c714c7596e1a7a1b964
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Feb 25 14:50:43 2009 -0800

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

-----------------------------------------------------------------------

Summary of changes:
 source/modules/vfs_acl_tdb.c   |   10 +++++-----
 source/modules/vfs_acl_xattr.c |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_acl_tdb.c b/source/modules/vfs_acl_tdb.c
index 08c782d..49a316a 100644
--- a/source/modules/vfs_acl_tdb.c
+++ b/source/modules/vfs_acl_tdb.c
@@ -191,7 +191,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);
@@ -282,7 +282,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);
@@ -508,7 +508,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);
@@ -758,7 +758,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);
@@ -888,7 +888,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/source/modules/vfs_acl_xattr.c b/source/modules/vfs_acl_xattr.c
index d2faf8e..b12422f 100644
--- a/source/modules/vfs_acl_xattr.c
+++ b/source/modules/vfs_acl_xattr.c
@@ -384,7 +384,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);
@@ -566,7 +566,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);


-- 
Samba Shared Repository