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

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  0c8b8f2f3483a585d974ce803357f1d9f39e3c9f (commit)
      from  8d178837f259757340a09a688ed194e3e4a92c36 (commit)

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


- Log -----------------------------------------------------------------
commit 0c8b8f2f3483a585d974ce803357f1d9f39e3c9f
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Feb 25 13:46:46 2009 -0800

    Fix use of streams modules with CIFSFS client.
    Jeremy.

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

Summary of changes:
 source/modules/vfs_streams_depot.c |   14 ++++++++++++--
 source/modules/vfs_streams_xattr.c |   15 +++++++++++++--
 2 files changed, 25 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_streams_depot.c b/source/modules/vfs_streams_depot.c
index 8ff617c..2a5b7a9 100644
--- a/source/modules/vfs_streams_depot.c
+++ b/source/modules/vfs_streams_depot.c
@@ -495,7 +495,13 @@ static int streams_depot_unlink(vfs_handle_struct *handle,  const char *fname)
 	 * We potentially need to delete the per-inode streams directory
 	 */
 
-	if (SMB_VFS_NEXT_STAT(handle, fname, &sbuf) == -1) {
+	if (lp_posix_pathnames()) {
+		ret = SMB_VFS_NEXT_LSTAT(handle, fname, &sbuf);
+	} else {
+		ret = SMB_VFS_NEXT_STAT(handle, fname, &sbuf);
+	}
+
+	if (ret == -1) {
 		return -1;
 	}
 
@@ -679,7 +685,11 @@ static NTSTATUS streams_depot_streaminfo(vfs_handle_struct *handle,
 		if (is_ntfs_stream_name(fname)) {
 			return NT_STATUS_INVALID_PARAMETER;
 		}
-		ret = SMB_VFS_NEXT_STAT(handle, fname, &sbuf);
+		if (lp_posix_pathnames()) {
+			ret = SMB_VFS_NEXT_LSTAT(handle, fname, &sbuf);
+		} else {
+			ret = SMB_VFS_NEXT_STAT(handle, fname, &sbuf);
+		}
 	}
 
 	if (ret == -1) {
diff --git a/source/modules/vfs_streams_xattr.c b/source/modules/vfs_streams_xattr.c
index 7124c57..2e203f3 100644
--- a/source/modules/vfs_streams_xattr.c
+++ b/source/modules/vfs_streams_xattr.c
@@ -135,6 +135,7 @@ static bool streams_xattr_recheck(struct stream_io *sio)
 static int streams_xattr_fstat(vfs_handle_struct *handle, files_struct *fsp,
 			       SMB_STRUCT_STAT *sbuf)
 {
+	int ret = -1;
 	struct stream_io *io = (struct stream_io *)
 		VFS_FETCH_FSP_EXTENSION(handle, fsp);
 
@@ -148,7 +149,13 @@ static int streams_xattr_fstat(vfs_handle_struct *handle, files_struct *fsp,
 		return -1;
 	}
 
-	if (SMB_VFS_STAT(handle->conn, io->base, sbuf) == -1) {
+	if (lp_posix_pathnames()) {
+		ret = SMB_VFS_LSTAT(handle->conn, io->base, sbuf);
+	} else {
+		ret = SMB_VFS_STAT(handle->conn, io->base, sbuf);
+	}
+
+	if (ret == -1) {
 		return -1;
 	}
 
@@ -718,7 +725,11 @@ static NTSTATUS streams_xattr_streaminfo(vfs_handle_struct *handle,
 		if (is_ntfs_stream_name(fname)) {
 			return NT_STATUS_INVALID_PARAMETER;
 		}
-		ret = SMB_VFS_STAT(handle->conn, fname, &sbuf);
+		if (lp_posix_pathnames()) {
+			ret = SMB_VFS_LSTAT(handle->conn, fname, &sbuf);
+		} else {
+			ret = SMB_VFS_STAT(handle->conn, fname, &sbuf);
+		}
 	}
 
 	if (ret == -1) {


-- 
Samba Shared Repository