[SCM] Samba Shared Repository - branch master updated - ce310f666d4896ab2cc13514fc5eb55157028cd0

[Jeremy Allison]

The branch, master has been updated
       via  ce310f666d4896ab2cc13514fc5eb55157028cd0 (commit)
      from  9ae1a17c95185aab928d3e362c37caf5d752c411 (commit)

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


- Log -----------------------------------------------------------------
commit ce310f666d4896ab2cc13514fc5eb55157028cd0
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Dec 1 13:59:21 2008 -0800

    s3:streams_depot: map 'file::$DATA' to just 'file'
    
    metze

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

Summary of changes:
 source3/modules/vfs_streams_depot.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_streams_depot.c b/source3/modules/vfs_streams_depot.c
index 0d6e0e0..80c6931 100644
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -271,6 +271,11 @@ static char *stream_name(vfs_handle_struct *handle, const char *fname,
 		goto fail;
 	}
 
+	/* if it's the ::$DATA stream just return the base file name */
+	if (!sname) {
+		return base;
+	}
+
 	dirname = stream_dir(handle, base, NULL, create_dir);
 
 	if (dirname == NULL) {
@@ -410,6 +415,7 @@ static int streams_depot_open(vfs_handle_struct *handle,  const char *fname,
 {
 	TALLOC_CTX *frame;
 	char *base = NULL;
+	char *sname = NULL;
 	SMB_STRUCT_STAT base_sbuf;
 	char *stream_fname;
 	int ret = -1;
@@ -421,11 +427,16 @@ static int streams_depot_open(vfs_handle_struct *handle,  const char *fname,
 	frame = talloc_stackframe();
 
 	if (!NT_STATUS_IS_OK(split_ntfs_stream_name(talloc_tos(), fname,
-						    &base, NULL))) {
+						    &base, &sname))) {
 		errno = ENOMEM;
 		goto done;
 	}
 
+	if (!sname) {
+		ret = SMB_VFS_NEXT_OPEN(handle, base, fsp, flags, mode);
+		goto done;
+	}
+
 	ret = SMB_VFS_NEXT_STAT(handle, base, &base_sbuf);
 
 	if (ret == -1) {


-- 
Samba Shared Repository