summaryrefslogtreecommitdiff
path: root/source3/smbd/msdfs.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-09-30 13:35:59 -0700
committerJeremy Allison <jra@samba.org>2011-10-01 00:45:59 +0200
commitc704d9216d9aada8ee5a691cd2a53e16165c8ac2 (patch)
treee287e8ed98fa38afdafb9a89282a4eaa5228bd0c /source3/smbd/msdfs.c
parent5c569a97ab477a324a96aae7f58770ccbe2572de (diff)
downloadsamba-c704d9216d9aada8ee5a691cd2a53e16165c8ac2.tar.gz
samba-c704d9216d9aada8ee5a691cd2a53e16165c8ac2.tar.bz2
samba-c704d9216d9aada8ee5a691cd2a53e16165c8ac2.zip
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
Diffstat (limited to 'source3/smbd/msdfs.c')
-rw-r--r--source3/smbd/msdfs.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 64a6b40820..c49cb61f6c 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;
}
}