smbd: only call scavenger_schedule_disconnected() if smbXsrv_open_close() succeeded

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

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index e0fc4618209861df32e081d4bf36f01a203390cd..ce04056fc34d0aca6d563c39a0f16a36d9ebddd5 100644 (file)
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -892,7 +892,6 @@ static NTSTATUS close_normal_file(struct smb_request *req, files_struct *fsp,
                                          "proceeding with normal close\n",
                                          fsp_str_dbg(fsp), nt_errstr(tmp)));
                        }
-                       scavenger_schedule_disconnected(fsp);
                } else {
                        DEBUG(1, ("Failed to disconnect durable handle for "
                                  "file %s: %s - proceeding with normal "
@@ -912,6 +911,7 @@ static NTSTATUS close_normal_file(struct smb_request *req, files_struct *fsp,
                DEBUG(10, ("%s disconnected durable handle for file %s\n",
                           conn->session_info->unix_info->unix_name,
                           fsp_str_dbg(fsp)));
+               scavenger_schedule_disconnected(fsp);
                return NT_STATUS_OK;
        }