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

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index ac218a16fec63313aacb3deb8c953eeb3e83203f..a4f9cd1bf6b4310cce07849bfe37d43479b11229 100644 (file)
--- 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 76fcb8cbe3850a8deb1b2707a1e1260e427df77b..9da8a8da758ebf093db3d23db8a521eac657e8b1 100644 (file)
--- 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 c5ca6b7176b6ce620a4b555b5cf0e2fffbd8a184..60f9a7d767f5906609c4f15c028f94015327e75e 100644 (file)
--- 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 590ee5bf7cea296165150ba742d37a320f10ac12..d4b32ce7ecd8d56014d2959e8092452aa7760873 100644 (file)
--- 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)) {