summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/close.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 09276cd200..bc1182032d 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -363,8 +363,6 @@ static int close_directory(files_struct *fsp, enum file_close_type close_type)
delete_dir = (lck->delete_on_close | lck->initial_delete_on_close);
- TALLOC_FREE(lck);
-
if ((close_type == NORMAL_CLOSE || close_type == SHUTDOWN_CLOSE) &&
delete_dir &&
lck->delete_token) {
@@ -382,6 +380,8 @@ static int close_directory(files_struct *fsp, enum file_close_type close_type)
lck->delete_token->groups,
NULL);
+ TALLOC_FREE(lck);
+
ok = rmdir_internals(fsp->conn, fsp->fsp_name);
DEBUG(5,("close_directory: %s. Delete on close was set - deleting directory %s.\n",
@@ -402,6 +402,7 @@ static int close_directory(files_struct *fsp, enum file_close_type close_type)
}
process_pending_change_notify_queue((time_t)0);
} else {
+ TALLOC_FREE(lck);
remove_pending_change_notify_requests_by_fid(fsp, NT_STATUS_CANCELLED);
}