From d79d0508a4b8bdc4582a350d109181ecae0bf1e2 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 11 Aug 2023 15:19:01 -0700 Subject: [PATCH] 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 Reviewed-by: Noel Power Autobuild-User(master): Noel Power Autobuild-Date(master): Mon Aug 14 19:52:49 UTC 2023 on atb-devel-224 --- selftest/knownfail.d/smb1_negotiate_exit | 1 - source3/smbd/smb1_reply.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 selftest/knownfail.d/smb1_negotiate_exit diff --git a/selftest/knownfail.d/smb1_negotiate_exit b/selftest/knownfail.d/smb1_negotiate_exit deleted file mode 100644 index 8fd9d749686..00000000000 --- 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 8139436aa38..f685be8016e 100644 --- a/source3/smbd/smb1_reply.c +++ b/source3/smbd/smb1_reply.c @@ -5005,6 +5005,7 @@ static void reply_exit_done(struct tevent_req *req) reply_force_doserror(smb1req, ERRSRV, ERRinvnid); smb_request_done(smb1req); END_PROFILE(SMBexit); + return; } /* @@ -5044,6 +5045,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); }