[SCM] Samba Shared Repository - branch v3-6-test updated

[Volker Lendecke]

The branch, v3-6-test has been updated
       via  22fc5f2 s3: Fix a typo
       via  edee50f s3: Attempt to fix the shadow_copy2 module
      from  7d3e3e8 s3-waf: no need to compile ../librpc/ndr/ndr_compression.c twice.

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


- Log -----------------------------------------------------------------
commit 22fc5f27b80b3eb597508126447cde74bae7ac5e
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 30 22:59:13 2010 +0100

    s3: Fix a typo

commit edee50f9a9672684ec5e855cbdbd3400fd9e94e5
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 30 22:57:00 2010 +0100

    s3: Attempt to fix the shadow_copy2 module
    
    This module is from hell. Please make 100% sure that you did test it
    properly when touching it! This module has probably given me more grey
    hair than any other piece of Samba, so PLEASE PLEASE PLEASE be careful here!!!

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

Summary of changes:
 source3/modules/vfs_default.c      |    2 +-
 source3/modules/vfs_shadow_copy2.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index eb0e0b9..977a563 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1078,7 +1078,7 @@ static char *vfswrap_realpath(vfs_handle_struct *handle,  const char *path)
 		if (!resolved_path) {
 			SAFE_FREE(result);
 		} else {
-			/* SMB_ASSERT(result == resovled_path) ? */
+			/* SMB_ASSERT(result == resolved_path) ? */
 			result = resolved_path;
 		}
 	}
diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index ba6b344..f47b287 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -671,10 +671,10 @@ static char *shadow_copy2_realpath(vfs_handle_struct *handle,
 		copy[gmt - fname + 1] = '\0';
 
 		DEBUG(10, ("calling NEXT_REALPATH with %s\n", copy));
-		SHADOW2_NEXT(REALPATH, (handle, copy), char *,
+		SHADOW2_NEXT(REALPATH, (handle, fname), char *,
 			     NULL);
 	}
-        SHADOW2_NEXT(REALPATH, (handle, name), char *, NULL);
+        SHADOW2_NEXT(REALPATH, (handle, fname), char *, NULL);
 }
 
 static const char *shadow_copy2_connectpath(struct vfs_handle_struct *handle,


-- 
Samba Shared Repository