]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Fix bug #8493 - DFS breaks zip file extracting unless "follow symlinks = no" set
authorJeremy Allison <jra@samba.org>
Fri, 30 Sep 2011 20:35:59 +0000 (13:35 -0700)
committerKarolin Seeger <kseeger@samba.org>
Mon, 3 Oct 2011 17:38:06 +0000 (19:38 +0200)
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

index 3bdedb8651eaf5d2cc365fbc5a85cc15fb223bca..f0f5d0669702dd80cca80b5722811f0f5c40b739 100644 (file)
@@ -575,15 +575,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,
@@ -594,11 +589,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;
                }
        }