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

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  161dc96c1147f637b5ef78bb3f543f6d5e0618c6 (commit)
      from  73d0c3143eedb5a9fd4d154aaf42d20ba6a19a1f (commit)

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


- Log -----------------------------------------------------------------
commit 161dc96c1147f637b5ef78bb3f543f6d5e0618c6
Author: Jeremy Allison <j...@samba.org>
Date:   Wed Feb 25 13:48:30 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 7f46f77..a1a1fc1 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