Attachment 18184 Details for Bug 15520 – 4.19 patch

[patch] 4.19 patch

0001-pytests-sid_strings-do-not-fail-if-epoch-ending-has-.patch (text/plain), 1.58 KB, created by Douglas Bagnall on 2023-11-15 05:17:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Douglas Bagnall

Created: 2023-11-15 05:17:47 UTC

Size: 1.58 KB

patch

obsolete

>From b7afe9c2232ebeea140f7478dd9c5e18c497674c Mon Sep 17 00:00:00 2001
>From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>Date: Wed, 15 Nov 2023 13:03:27 +1300
>Subject: [PATCH] pytests: sid_strings: do not fail if epoch ending has zeros
>
>To avoid collisions in random OID strings, we started using the epoch
>date modulus 100 million. The trouble is we did not strip out the
>leading zeros, so the field might be '00000123' when it should be
>'123', if the date happened not to correspond to an epoch with a zero
>in the eighth to last place. This has been the case for most of the
>last 1041 days, but fortunately the bug was only introduced earlier
>this year.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15520
>
>Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>Reviewed-by: Martin Schwenke <mschwenke@ddn.com>
>(cherry picked from commit 426ca4cf4b667aae03f0344cee449e972de90ac7)
>---
> python/samba/tests/sid_strings.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/python/samba/tests/sid_strings.py b/python/samba/tests/sid_strings.py
>index 5ff1edc0642..139849a4981 100644
>--- a/python/samba/tests/sid_strings.py
>+++ b/python/samba/tests/sid_strings.py
>@@ -98,7 +98,7 @@ class SidStringBase(TestCase):
> 
>         class_dn = f'CN={class_name},{self.schema_dn}'
> 
>-        governs_id = f'1.3.6.1.4.1.7165.4.6.2.9.{self.timestamp[-8:]}.{suffix}'
>+        governs_id = f'1.3.6.1.4.1.7165.4.6.2.9.1{self.timestamp[-7:]}.{suffix}'
> 
>         # expected_sid can be a SID string, an error code, None, or a
>         # special value indicating a deferred error, as follows:
>-- 
>2.39.2
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 15520: 18183 | 18184