smbd: Always use UCF_PREP_CREATEFILE for filename_convert calls to resolve a path...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=10297

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Mon Dec  9 21:02:21 CET 2013 on sn-devel-104

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 1ed2242724513646d070a1b614892442559ced7d..bca4cd8ab54df7baa4f078adfe93e59b47e32afc 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -538,8 +538,7 @@ void reply_ntcreate_and_X(struct smb_request *req)
                                conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                fname,
-                               (create_disposition == FILE_CREATE)
-                                 ? UCF_PREP_CREATEFILE : 0,
+                               UCF_PREP_CREATEFILE,
                                NULL,
                                &smb_fname);
 
@@ -1067,8 +1066,7 @@ static void call_nt_transact_create(connection_struct *conn,
                                conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                fname,
-                               (create_disposition == FILE_CREATE)
-                                 ? UCF_PREP_CREATEFILE : 0,
+                               UCF_PREP_CREATEFILE,
                                NULL,
                                &smb_fname);
 

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index aba1d1b64f33fcc6aaae06110fdb6a561a5bf6a4..72dadf6dbbf4bf729249f53ab2c83218da265706 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1917,8 +1917,7 @@ void reply_open(struct smb_request *req)
                                conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                fname,
-                               (create_disposition == FILE_CREATE)
-                                 ? UCF_PREP_CREATEFILE : 0,
+                               UCF_PREP_CREATEFILE,
                                NULL,
                                &smb_fname);
        if (!NT_STATUS_IS_OK(status)) {
@@ -2086,8 +2085,7 @@ void reply_open_and_X(struct smb_request *req)
                                conn,
                                req->flags2 & FLAGS2_DFS_PATHNAMES,
                                fname,
-                               (create_disposition == FILE_CREATE)
-                                 ? UCF_PREP_CREATEFILE : 0,
+                               UCF_PREP_CREATEFILE,
                                NULL,
                                &smb_fname);
        if (!NT_STATUS_IS_OK(status)) {

diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 74881c6d0431e65fcf084f86abe4457b97b3f19d..f2fec083353043a10e8701b2e68ccdda38b6c38e 100644 (file)
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -891,8 +891,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                                  smb1req->conn,
                                                  smb1req->flags2 & FLAGS2_DFS_PATHNAMES,
                                                  fname,
-                                                 (in_create_disposition == FILE_CREATE) ?
-                                                 UCF_PREP_CREATEFILE : 0,
+                                                 UCF_PREP_CREATEFILE,
                                                  NULL, /* ppath_contains_wcards */
                                                  &smb_fname);
                        if (!NT_STATUS_IS_OK(status)) {