s3: smbd: Add missing 'return;'s in exit paths in reply_exit_done().

Remove knownfail.

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

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Mon Aug 14 19:52:49 UTC 2023 on atb-devel-224

(cherry picked from commit d79d0508a4b8bdc4582a350d109181ecae0bf1e2)

Autobuild-User(v4-17-test): Jule Anger <janger@samba.org>
Autobuild-Date(v4-17-test): Wed Aug 16 09:48:00 UTC 2023 on sn-devel-184

diff --git a/selftest/knownfail.d/smb1_negotiate_exit b/selftest/knownfail.d/smb1_negotiate_exit
deleted file mode 100644 (file)
index 8fd9d74..0000000
--- a/selftest/knownfail.d/smb1_negotiate_exit
+++ /dev/null
@@ -1 +0,0 @@
-^samba3.smbtorture_s3.smb1.SMB1-NEGOTIATE-EXIT.smbtorture\(fileserver_smb1\)

diff --git a/source3/smbd/smb1_reply.c b/source3/smbd/smb1_reply.c
index 343b7ee2b4913ebed865019b9280d9c7c6dbb0e3..fbba3800b959a4007c63b165858cbfb8ec3732f2 100644 (file)
--- a/source3/smbd/smb1_reply.c
+++ b/source3/smbd/smb1_reply.c
@@ -4661,6 +4661,7 @@ static void reply_exit_done(struct tevent_req *req)
                reply_force_doserror(smb1req, ERRSRV, ERRinvnid);
                smb_request_done(smb1req);
                END_PROFILE(SMBexit);
+               return;
        }
 
        /*
@@ -4700,6 +4701,7 @@ static void reply_exit_done(struct tevent_req *req)
                        reply_force_doserror(smb1req, ERRSRV, ERRinvnid);
                        smb_request_done(smb1req);
                        END_PROFILE(SMBexit);
+                       return;
                }
                close_file_free(NULL, &fsp, SHUTDOWN_CLOSE);
        }