Attachment 17848 Details for Bug 15344 – patch in master backported to Samba 4.18

[patch] patch in master backported to Samba 4.18

2477757f929c79848841e5e77a9c3bceab3291ba.patch (text/plain), 2.03 KB, created by Andrew Bartlett on 2023-03-29 20:25:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2023-03-29 20:25:20 UTC

Size: 2.03 KB

patch

obsolete

>From 2477757f929c79848841e5e77a9c3bceab3291ba Mon Sep 17 00:00:00 2001
>From: Joseph Sutton <josephsutton@catalyst.net.nz>
>Date: Wed, 1 Mar 2023 11:37:03 +1300
>Subject: [PATCH] torture/backupkey: Fix flapping test
>
>UNEXPECTED(failure): samba4.rpc.backupkey with seal.backupkey.server_wrap_decrypt_wrong_r2(ad_dc_default)
>REASON: Exception: Exception: ../../source4/torture/rpc/backupkey.c:2219: r.out.result was WERR_INVALID_ACCESS, expected WERR_INVALID_PARAMETER: decrypt should fail with WERR_INVALID_PARAMETER
>
>As commit 664bde19bf1db1b3740621cdf3f46f9bfd0e8452 states:
>
>"The use of the wrong key can still create structures that parse as a
>SID, therefore we can sometimes get an unusual error, which becomes a
>flapping test".
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15344
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12107
>
>Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit aa90354e2426dc1af445f5b3243ad3cd7ebce902)
>
>[abartlet@samba.org Added bug 15344 for backport of this newer fix]
>---
> source4/torture/rpc/backupkey.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/source4/torture/rpc/backupkey.c b/source4/torture/rpc/backupkey.c
>index c84e62883be0..8d932316ded4 100644
>--- a/source4/torture/rpc/backupkey.c
>+++ b/source4/torture/rpc/backupkey.c
>@@ -2216,10 +2216,12 @@ static bool test_ServerWrap_decrypt_wrong_stuff(struct torture_context *tctx,
> 					  WERR_INVALID_ACCESS,
> 					  "decrypt should fail with WERR_INVALID_ACCESS");
> 	} else {
>-		torture_assert_werr_equal(tctx,
>-					  r.out.result,
>-					  WERR_INVALID_PARAMETER,
>-					  "decrypt should fail with WERR_INVALID_PARAMETER");
>+		if (!W_ERROR_EQUAL(r.out.result, WERR_INVALID_ACCESS)
>+		    && !W_ERROR_EQUAL(r.out.result, WERR_INVALID_PARAMETER)) {
>+			torture_assert_werr_equal(tctx, r.out.result,
>+						  WERR_INVALID_DATA,
>+						  "decrypt should fail with WERR_INVALID_ACCESS, WERR_INVALID_PARAMETER or WERR_INVALID_DATA");
>+		}
> 	}
> 
> 	return true;
>-- 
>GitLab
>

Flags:

abartlet: ci-passed+

Actions: View

Attachments on bug 15344: 17848