summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-05-23 13:22:47 +0200
committerStefan Metzmacher <metze@samba.org>2012-05-24 16:14:01 +0200
commita95b2ba043ce843149fef4821cc25823c53cf994 (patch)
treeaadff73ee71f5df60013836b1c2116d9ba295c4e /source3
parent758d61201f7b51da6ce74aee2d18c5125d72522e (diff)
downloadsamba-a95b2ba043ce843149fef4821cc25823c53cf994.tar.gz
samba-a95b2ba043ce843149fef4821cc25823c53cf994.tar.bz2
samba-a95b2ba043ce843149fef4821cc25823c53cf994.zip
s3:smbd/msdfs: pass allow_broken_path to resolve_dfspath_wcard()
metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Thu May 24 16:14:01 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/filename.c2
-rw-r--r--source3/smbd/msdfs.c3
-rw-r--r--source3/smbd/proto.h1
-rw-r--r--source3/smbd/trans2.c1
4 files changed, 6 insertions, 1 deletions
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index ac218a16fe..a4f9cd1bf6 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -28,6 +28,7 @@
#include "system/filesys.h"
#include "fake_file.h"
#include "smbd/smbd.h"
+#include "smbd/globals.h"
static NTSTATUS build_stream_path(TALLOC_CTX *mem_ctx,
connection_struct *conn,
@@ -1309,6 +1310,7 @@ static NTSTATUS filename_convert_internal(TALLOC_CTX *ctx,
dfs_path,
name_in,
allow_wcards,
+ !conn->sconn->using_smb2,
&fname,
ppath_contains_wcard);
if (!NT_STATUS_IS_OK(status)) {
diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 76fcb8cbe3..9da8a8da75 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -1555,6 +1555,7 @@ NTSTATUS resolve_dfspath_wcard(TALLOC_CTX *ctx,
bool dfs_pathnames,
const char *name_in,
bool allow_wcards,
+ bool allow_broken_path,
char **pp_name_out,
bool *ppath_contains_wcard)
{
@@ -1566,7 +1567,7 @@ NTSTATUS resolve_dfspath_wcard(TALLOC_CTX *ctx,
conn,
name_in,
allow_wcards,
- !smbd_server_conn->using_smb2,
+ allow_broken_path,
pp_name_out,
&path_contains_wcard);
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index c5ca6b7176..60f9a7d767 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -477,6 +477,7 @@ NTSTATUS resolve_dfspath_wcard(TALLOC_CTX *ctx,
bool dfs_pathnames,
const char *name_in,
bool allow_wcards,
+ bool allow_broken_path,
char **pp_name_out,
bool *ppath_contains_wcard);
NTSTATUS create_conn_struct(TALLOC_CTX *ctx,
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 590ee5bf7c..d4b32ce7ec 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -6236,6 +6236,7 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
req->flags2 & FLAGS2_DFS_PATHNAMES,
newname,
true,
+ !conn->sconn->using_smb2,
&newname,
&dest_has_wcard);
if (!NT_STATUS_IS_OK(status)) {