s3: smbd: Split out ucf_flags_from_smb_request() from filename_create_ucf_flags().

We will use this elsewhere in later commits.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>

diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 36717a6e60c042b5416f13e7e568b3d31d1f7b36..b334816f1344be1584db3c6a3f49f6ba6461ac76 100644 (file)
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -30,7 +30,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 
-uint32_t filename_create_ucf_flags(struct smb_request *req, uint32_t create_disposition)
+uint32_t ucf_flags_from_smb_request(struct smb_request *req)
 {
        uint32_t ucf_flags = 0;
 
@@ -38,6 +38,15 @@ uint32_t filename_create_ucf_flags(struct smb_request *req, uint32_t create_disp
                ucf_flags |= UCF_POSIX_PATHNAMES;
        }
 
+       return ucf_flags;
+}
+
+uint32_t filename_create_ucf_flags(struct smb_request *req, uint32_t create_disposition)
+{
+       uint32_t ucf_flags = 0;
+
+       ucf_flags |= ucf_flags_from_smb_request(req);
+
        switch (create_disposition) {
        case FILE_OPEN:
        case FILE_OVERWRITE:

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 770c3c24994933c2ac1414f910dc1c2210761130..65994364b0808596370ad08c22df2b07bb339cab 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -338,6 +338,7 @@ int fsp_stat(files_struct *fsp);
 
 /* The following definitions come from smbd/filename.c  */
 
+uint32_t ucf_flags_from_smb_request(struct smb_request *req);
 uint32_t filename_create_ucf_flags(struct smb_request *req, uint32_t create_disposition);
 NTSTATUS unix_convert(TALLOC_CTX *ctx,
                      connection_struct *conn,