smbd: Remove bool arg from set_delete_on_close_lck

We now have reset_delete_on_close_lck, this was called with "true"
everywhere now.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index e9c303907b8f924458f77b0fb9561d8fe425211c..bcc9bfeff85e7e21f3a99bdeef98631c21f176d0 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -1115,7 +1115,6 @@ void reset_delete_on_close_lck(files_struct *fsp,
 
 void set_delete_on_close_lck(files_struct *fsp,
                        struct share_mode_lock *lck,
-                       bool delete_on_close,
                        const struct security_token *nt_tok,
                        const struct security_unix_token *tok)
 {
@@ -1123,12 +1122,6 @@ void set_delete_on_close_lck(files_struct *fsp,
        int i;
        bool ret;
 
-       if (!delete_on_close) {
-               SMB_ASSERT(nt_tok == NULL);
-               SMB_ASSERT(tok == NULL);
-               return reset_delete_on_close_lck(fsp, lck);
-       }
-
        SMB_ASSERT(nt_tok != NULL);
        SMB_ASSERT(tok != NULL);
 
@@ -1170,9 +1163,7 @@ bool set_delete_on_close(files_struct *fsp, bool delete_on_close,
        }
 
        if (delete_on_close) {
-               set_delete_on_close_lck(fsp, lck, true,
-                       nt_tok,
-                       tok);
+               set_delete_on_close_lck(fsp, lck, nt_tok, tok);
        } else {
                reset_delete_on_close_lck(fsp, lck);
        }

diff --git a/source3/locking/proto.h b/source3/locking/proto.h
index 8a0e0234fc5c7f380879af1245d1b1a11a352fb5..75faa94e09ed9f7c7067489ada99f10389dc275e 100644 (file)
--- a/source3/locking/proto.h
+++ b/source3/locking/proto.h
@@ -189,7 +189,6 @@ void reset_delete_on_close_lck(files_struct *fsp,
                               struct share_mode_lock *lck);
 void set_delete_on_close_lck(files_struct *fsp,
                        struct share_mode_lock *lck,
-                       bool delete_on_close,
                        const struct security_token *nt_tok,
                        const struct security_unix_token *tok);
 bool set_delete_on_close(files_struct *fsp, bool delete_on_close,

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 415e50e4e027fad003f95768ff1528074dfeb542..09be2e7b92c7fbe90e24c7934136f438ccb8069d 100644 (file)
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -303,7 +303,7 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
                        became_user = True;
                }
                fsp->delete_on_close = true;
-               set_delete_on_close_lck(fsp, lck, True,
+               set_delete_on_close_lck(fsp, lck,
                                get_current_nttok(conn),
                                get_current_utok(conn));
                if (became_user) {
@@ -1076,7 +1076,7 @@ static NTSTATUS close_directory(struct smb_request *req, files_struct *fsp,
                }
                send_stat_cache_delete_message(fsp->conn->sconn->msg_ctx,
                                               fsp->fsp_name->base_name);
-               set_delete_on_close_lck(fsp, lck, true,
+               set_delete_on_close_lck(fsp, lck,
                                get_current_nttok(fsp->conn),
                                get_current_utok(fsp->conn));
                fsp->delete_on_close = true;