[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1250-ga6d0a93

[Jeremy Allison]

The branch, master has been updated
       via  a6d0a93fc27729b63ae3fd4994059f3854a63845 (commit)
      from  9e54f4151cf0e5d958f1929d854d082635b11c39 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


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

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

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

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index 5cd3e21..73dbca4 100644
--- 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 f46e468..039e469 100644
--- 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);


-- 
Samba Shared Repository