s3: smbd: Remove UCF_SAVE_LCOMP flag. Note it is no longer used.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 670711ff79baa1fbaec39741a31be3625bbbf9a7..001dbe2a79de983b195ca0d930d44e51c8d0b95d 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1646,7 +1646,7 @@ void reply_ntrename(struct smb_request *req)
         */
        if (rename_type == RENAME_FLAG_RENAME) {
                ucf_flags_src |= UCF_COND_ALLOW_WCARD_LCOMP;
-               ucf_flags_dst |= UCF_COND_ALLOW_WCARD_LCOMP | UCF_SAVE_LCOMP;
+               ucf_flags_dst |= UCF_COND_ALLOW_WCARD_LCOMP;
        }
 
        /* rename_internals() calls unix_convert(), so don't call it here. */

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index eee9c986db638f763cada93748dcdeb581741537..b23a2d373b2b7e323b049ca5bdc1bda411036232 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -8296,7 +8296,6 @@ void reply_mv(struct smb_request *req)
                        UCF_UNIX_NAME_LOOKUP :
                        UCF_COND_ALLOW_WCARD_LCOMP);
        uint32_t dst_ucf_flags = ucf_flags_from_smb_request(req) |
-               UCF_SAVE_LCOMP |
                (req->posix_pathnames ?
                        0 :
                        UCF_COND_ALLOW_WCARD_LCOMP);

diff --git a/source3/smbd/smb2_query_directory.c b/source3/smbd/smb2_query_directory.c
index 131abfaee0e6c51920db6fa527b511de20111da2..1c7d4e91c9730a94dae4c0db9f987f20230d96f2 100644 (file)
--- a/source3/smbd/smb2_query_directory.c
+++ b/source3/smbd/smb2_query_directory.c
@@ -402,8 +402,7 @@ static struct tevent_req *smbd_smb2_query_directory_send(TALLOC_CTX *mem_ctx,
                const char *fullpath;
                char tmpbuf[PATH_MAX];
                char *to_free = NULL;
-               uint32_t ucf_flags = UCF_SAVE_LCOMP |
-                                    UCF_ALWAYS_ALLOW_WCARD_LCOMP |
+               uint32_t ucf_flags = UCF_ALWAYS_ALLOW_WCARD_LCOMP |
                                     (state->smbreq->posix_pathnames ?
                                        UCF_POSIX_PATHNAMES : 0);
 

diff --git a/source3/smbd/smbd.h b/source3/smbd/smbd.h
index a3c372b95b1001a84b9a6a91fabc355b9dd805e1..4c13239c7932cabfbd575fdb343164a08587fe27 100644 (file)
--- a/source3/smbd/smbd.h
+++ b/source3/smbd/smbd.h
@@ -68,7 +68,7 @@ struct trans_state {
 /*
  * unix_convert_flags
  */
-#define UCF_SAVE_LCOMP                 0x00000001
+/* UCF_SAVE_LCOMP 0x00000001 is no longer used. */
 #define UCF_ALWAYS_ALLOW_WCARD_LCOMP   0x00000002
 #define UCF_COND_ALLOW_WCARD_LCOMP     0x00000004
 #define UCF_POSIX_PATHNAMES            0x00000008

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index e31e61087f888ed6ecb60310e07ce09fe46fe7d0..ddeb4c6b04c763f7cc25e2805415042db938263b 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2729,7 +2729,7 @@ static void call_trans2findfirst(connection_struct *conn,
        NTSTATUS ntstatus = NT_STATUS_OK;
        bool ask_sharemode = lp_smbd_search_ask_sharemode(SNUM(conn));
        struct smbd_server_connection *sconn = req->sconn;
-       uint32_t ucf_flags = UCF_SAVE_LCOMP | UCF_ALWAYS_ALLOW_WCARD_LCOMP |
+       uint32_t ucf_flags = UCF_ALWAYS_ALLOW_WCARD_LCOMP |
                        ucf_flags_from_smb_request(req);
        bool backup_priv = false;
        bool as_root = false;
@@ -7084,8 +7084,7 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
        char *newname = NULL;
        struct smb_filename *smb_fname_dst = NULL;
        const char *dst_original_lcomp = NULL;
-       uint32_t ucf_flags = UCF_SAVE_LCOMP |
-               ucf_flags_from_smb_request(req);
+       uint32_t ucf_flags = ucf_flags_from_smb_request(req);
        NTSTATUS status = NT_STATUS_OK;
        TALLOC_CTX *ctx = talloc_tos();
 
@@ -7200,8 +7199,7 @@ static NTSTATUS smb_file_link_information(connection_struct *conn,
        char *newname = NULL;
        struct smb_filename *smb_fname_dst = NULL;
        NTSTATUS status = NT_STATUS_OK;
-       uint32_t ucf_flags = UCF_SAVE_LCOMP |
-               ucf_flags_from_smb_request(req);
+       uint32_t ucf_flags = ucf_flags_from_smb_request(req);
        TALLOC_CTX *ctx = talloc_tos();
 
        if (!fsp) {
@@ -7381,8 +7379,7 @@ static NTSTATUS smb_file_rename_information(connection_struct *conn,
                 * the newname instead.
                 */
                char *base_name = NULL;
-               uint32_t ucf_flags = UCF_SAVE_LCOMP |
-                       ucf_flags_from_smb_request(req);
+               uint32_t ucf_flags = ucf_flags_from_smb_request(req);
 
                if (dest_has_wcard) {
                        ucf_flags |= UCF_ALWAYS_ALLOW_WCARD_LCOMP;