Attachment 6972 Details for Bug 8493 – git-am fix for 3.6.1

[patch] git-am fix for 3.6.1

0001-Fix-bug-8493-DFS-breaks-zip-file-extracting-unless-f.patch (text/plain), 1.77 KB, created by Jeremy Allison on 2011-09-30 23:15:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2011-09-30 23:15:23 UTC

Size: 1.77 KB

patch

obsolete

>From c704d9216d9aada8ee5a691cd2a53e16165c8ac2 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 30 Sep 2011 13:35:59 -0700
>Subject: [PATCH] Fix bug #8493 - DFS breaks zip file extracting unless "follow symlinks = no" set
>
>If a client sends a mangled name as part of a DFS path, use the
>post-mangled name for the pathname walk, not the mangled name.
>
>Autobuild-User: Jeremy Allison <jra@samba.org>
>Autobuild-Date: Sat Oct  1 00:45:59 CEST 2011 on sn-devel-104
>---
> source3/smbd/msdfs.c |   13 ++-----------
> 1 files changed, 2 insertions(+), 11 deletions(-)
>
>diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
>index 64a6b40..c49cb61 100644
>--- a/source3/smbd/msdfs.c
>+++ b/source3/smbd/msdfs.c
>@@ -577,15 +577,10 @@ static NTSTATUS dfs_path_lookup(TALLOC_CTX *ctx,
> 		conn->connectpath, pdp->reqpath));
> 
> 	/*
>- 	 * Note the unix path conversion here we're doing we can
>+ 	 * Note the unix path conversion here we're doing we
> 	 * throw away. We're looking for a symlink for a dfs
> 	 * resolution, if we don't find it we'll do another
> 	 * unix_convert later in the codepath.
>-	 * If we needed to remember what we'd resolved in
>-	 * dp->reqpath (as the original code did) we'd
>-	 * copy (localhost, dp->reqpath) on any code
>-	 * path below that returns True - but I don't
>-	 * think this is needed. JRA.
> 	 */
> 
> 	status = unix_convert(ctx, conn, pdp->reqpath, &smb_fname,
>@@ -596,11 +591,7 @@ static NTSTATUS dfs_path_lookup(TALLOC_CTX *ctx,
> 				     NT_STATUS_OBJECT_PATH_NOT_FOUND)) {
> 			return status;
> 		}
>-
>-		/* Create an smb_fname to use below. */
>-		status = create_synthetic_smb_fname(ctx, pdp->reqpath, NULL,
>-						    NULL, &smb_fname);
>-		if (!NT_STATUS_IS_OK(status)) {
>+		if (smb_fname == NULL || smb_fname->base_name == NULL) {
> 			return status;
> 		}
> 	}
>-- 
>1.7.3.1
>

Flags:

metze: review+

Actions: View

Attachments on bug 8493: 6959 | 6970 | 6972