[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  bf9c3ee s3: Attempt to please autobuild
       via  45a44dd s3: Fix a typo
       via  538ed07 s3: Attempt to fix the shadow_copy2 module
      from  b7172e7 s4-drs: cope with invalid NTDS DNs from DsReplicaInfo()

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


- Log -----------------------------------------------------------------
commit bf9c3eedf834e5637a23f051e0c8db6687c6dcf1
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Dec 1 07:57:38 2010 +0100

    s3: Attempt to please autobuild
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Wed Dec  1 08:43:37 CET 2010 on sn-devel-104

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

    s3: Fix a typo

commit 538ed076a91c49edb7d11b73927f1e330b9abd79
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/locale/net/de.po           |    2 +-
 source3/modules/vfs_default.c      |    2 +-
 source3/modules/vfs_shadow_copy2.c |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/locale/net/de.po b/source3/locale/net/de.po
index 85b195e..a12fabd 100644
--- a/source3/locale/net/de.po
+++ b/source3/locale/net/de.po
@@ -3066,7 +3066,7 @@ msgstr "\t-e oder --encrypt\t\t\tSMB Übertragung verschlüsseln  (nur UNIX erwe
 
 #: ../../utils/net_help_common.c:54
 msgid "\t-k or --kerberos\t\tUse kerberos (active directory) authentication\n"
-msgstr "\t-k oder --kerberos\t\tKerberos Authentifizierung benutzen (Active Directory)\n"y
+msgstr "\t-k oder --kerberos\t\tKerberos Authentifizierung benutzen (Active Directory)\n"
 
 #: ../../utils/net_idmap.c:26
 msgid "Out of memory!\n"
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