[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Mon Aug 14 04:41:02 UTC 2023 

The branch, master has been updated
       via  57672e45e36 bootstrap: Install codespell
       via  b896da351c8 krb5: Increase the minimum MIT Krb5 version to 1.21
       via  4ae3e9b208d selftest: Allow MIT Krb5 1.21 to still start to fl2000dc
       via  8744e5df777 bootstrap: Heimdal no longer requires perl-JSON
       via  26329a69cd7 WHATSNEW: Remove unusual box around 'REMOVED FEATURES'
      from  58260e1e4fe python/samba/netcmd/domain/schemaupgrade.py: fix missing newline

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 57672e45e36bac567876eb1ebc098f1d33aaa1bc
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Mar 22 10:17:13 2023 +0100

    bootstrap: Install codespell
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Mon Aug 14 04:40:03 UTC 2023 on atb-devel-224

commit b896da351c8b27440dfb895e866d5a5ce0320b21
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jul 18 14:34:47 2023 +1200

    krb5: Increase the minimum MIT Krb5 version to 1.21
    
    This is the version we test with in CI after the image update
    in the next commit.  This addresses the issues that were
    fixed in CVE-2022-37967 (KrbtgtFullPacSignature) and ensures
    that Samba builds against the MIT version that allows us to
    avoid that attack.
    
    The hooks to allow these expectations to be disabled in the tests
    are kept for now, to allow this to be reverted or to test
    older servers.
    
    With MIT 1.21 as the new test standard for the MIT KDC build
    we update the knownfail_mit_kdc - this was required regadless
    after the CI image update.
    
    Any update to the CI image, even an unrelated one, brings in
    a new MIT Krb5, version 1.21-3 in this case.  This has new
    behaviour that needs to be noted in the knownfail files or
    else the tests, which haven't changed, will fail and
    pipelines won't pass.
    
    (The image generated by the earlier bootstrap commit brought
    in krb5-1.21-2 which was buggy with CVE-2023-39975)
    
    Further tweaks to tests or the server should reduce the number
    of knownfail entries, but this keeps the pipelines passing for now.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15231
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>

commit 4ae3e9b208d4badee5765eddd832b258e84665b2
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jul 18 14:50:55 2023 +1200

    selftest: Allow MIT Krb5 1.21 to still start to fl2000dc
    
    This is the simplest way to keep this test environment alive.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>

commit 8744e5df7779692862b0f6508e83290c35d267a5
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Jul 18 09:53:26 2023 +1200

    bootstrap: Heimdal no longer requires perl-JSON
    
    Heimdal after lorikeet-heimdal-202307040259
    (commit 33d117b8a9c11714ef709e63a005d87e34b9bfde)
    includes Heimdal master commit f62e2f278437ff6c03d2d09bd628381c795bba78.
    
    This has PR https://github.com/heimdal/heimdal/pull/1176 and no
    longer requires the external JSON module, as JSON::PP is builtin.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15394
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>

commit 26329a69cd7120cc640a3dbb9c4c48c6feb573a8
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Aug 9 07:37:30 2023 +1200

    WHATSNEW: Remove unusual box around 'REMOVED FEATURES'
    
    We do not normally put the ==== above the titles, per recent practice.
    
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Joseph Sutton <josephsutton at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 .gitlab-ci-main.yml                                |    2 +-
 WHATSNEW.txt                                       |   23 +-
 bootstrap/config.py                                |    5 +-
 bootstrap/generated-dists/centos7/bootstrap.sh     |    2 -
 bootstrap/generated-dists/centos7/packages.yml     |    2 -
 bootstrap/generated-dists/centos8s/bootstrap.sh    |    1 -
 bootstrap/generated-dists/centos8s/packages.yml    |    1 -
 .../generated-dists/debian11-32bit/bootstrap.sh    |    1 -
 .../generated-dists/debian11-32bit/packages.yml    |    1 -
 bootstrap/generated-dists/debian11/bootstrap.sh    |    1 -
 bootstrap/generated-dists/debian11/packages.yml    |    1 -
 .../generated-dists/debian12-32bit/bootstrap.sh    |    1 -
 .../generated-dists/debian12-32bit/packages.yml    |    1 -
 bootstrap/generated-dists/debian12/bootstrap.sh    |    1 -
 bootstrap/generated-dists/debian12/packages.yml    |    1 -
 bootstrap/generated-dists/fedora38/bootstrap.sh    |    3 +-
 bootstrap/generated-dists/fedora38/packages.yml    |    3 +-
 bootstrap/generated-dists/opensuse155/bootstrap.sh |    3 +-
 bootstrap/generated-dists/opensuse155/packages.yml |    3 +-
 .../generated-dists/ubuntu1804-32bit/bootstrap.sh  |    1 -
 .../generated-dists/ubuntu1804-32bit/packages.yml  |    1 -
 bootstrap/generated-dists/ubuntu1804/bootstrap.sh  |    1 -
 bootstrap/generated-dists/ubuntu1804/packages.yml  |    1 -
 bootstrap/generated-dists/ubuntu2004/bootstrap.sh  |    1 -
 bootstrap/generated-dists/ubuntu2004/packages.yml  |    1 -
 bootstrap/generated-dists/ubuntu2204/bootstrap.sh  |    1 -
 bootstrap/generated-dists/ubuntu2204/packages.yml  |    1 -
 bootstrap/sha1sum.txt                              |    2 +-
 python/samba/tests/krb5/raw_testcase.py            |    4 +-
 selftest/knownfail_mit_kdc                         | 3259 +++++++++++++++-----
 selftest/knownfail_mit_kdc_pre_1_20                |  203 --
 selftest/skip_mit_kdc_pre_1_20                     |    2 -
 selftest/target/Samba.pm                           |    2 +
 selftest/wscript                                   |    9 +-
 source4/selftest/tests.py                          |   21 +-
 wscript_configure_system_mitkrb5                   |    6 +-
 36 files changed, 2456 insertions(+), 1116 deletions(-)
 delete mode 100644 selftest/knownfail_mit_kdc_pre_1_20
 delete mode 100644 selftest/skip_mit_kdc_pre_1_20


Changeset truncated at 500 lines:

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 779eedb8255..51327e7dee8 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 190a74ee9628f298961d890ba37fcc7d213daae2
+  SAMBA_CI_CONTAINER_TAG: 21a93787675107f010836bbfa5e8542c272bc4b0
   #
   # We use the ubuntu2204 image as default as
   # it matches what we have on atb-devel-224
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 9c8192295e2..a4ddbb2f361 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -16,8 +16,29 @@ UPGRADING
 NEW FEATURES/CHANGES
 ====================
 
+New Minimum MIT Krb5 version for Samba AD Domain Controller
+-----------------------------------------------------------
+
+Samba now requires MIT 1.21 when built against a system MIT Krb5 and
+acting as an Active Directory DC.  This addresses the issues that were
+fixed in CVE-2022-37967 (KrbtgtFullPacSignature) and ensures that
+Samba builds against the MIT version that allows us to avoid that
+attack.
+
+Removed dependency on Perl JSON module
+--------------------------------------
+
+Distributions are advised that the Perl JSON package is no longer
+required by Samba builds that use the imported Heimdal.  The build
+instead uses Perl's JSON::PP built into recent perl5 versions.
+
+Current lists of packages required by Samba for major distributions
+are found in the bootstrap/generated-dists/ directory of a Samba
+source tree.  While there will be some differences - due to features
+chosen by packagers - comparing these lists with the build dependencies
+in a package may locate other dependencies we no longer require.
+
 
-================
 REMOVED FEATURES
 ================
 
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 5daf2d3ce54..d531dfc0e63 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -137,6 +137,7 @@ PKGS = [
     ('', 'ShellCheck'),
     ('', 'shfmt'),
     ('', 'crypto-policies-scripts'),
+    ('', 'codespell'),
 
     ('python3', 'python3'),
     ('python3-cryptography', 'python3-cryptography'), # for krb5 tests
@@ -156,8 +157,6 @@ PKGS = [
 
     # perl
     ('libparse-yapp-perl', 'perl-Parse-Yapp'),
-    ('libjson-perl', 'perl-JSON'),
-    ('', 'perl-JSON-Parse'),
     ('perl-modules', ''),
     ('', 'perl-FindBin'),
     ('', 'perl-Archive-Tar'),
@@ -516,6 +515,7 @@ RPM_DISTS = {
             'mold': '',
             'ShellCheck': '',
             'shfmt': '',
+            'codespell': '',
         }
     },
     'centos8s': {
@@ -533,6 +533,7 @@ RPM_DISTS = {
             'mold': '',
             'ShellCheck': '',
             'shfmt': '',
+            'codespell': '',
         }
     },
     'fedora38': {
diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index aa0638e9765..fd867616a46 100755
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -74,8 +74,6 @@ yum install -y \
     patch \
     perl-Archive-Tar \
     perl-ExtUtils-MakeMaker \
-    perl-JSON \
-    perl-JSON-Parse \
     perl-Parse-Yapp \
     perl-Test-Base \
     perl-core \
diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index edcc34791ec..2234bafc21b 100644
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -60,8 +60,6 @@ packages:
   - patch
   - perl-Archive-Tar
   - perl-ExtUtils-MakeMaker
-  - perl-JSON
-  - perl-JSON-Parse
   - perl-Parse-Yapp
   - perl-Test-Base
   - perl-core
diff --git a/bootstrap/generated-dists/centos8s/bootstrap.sh b/bootstrap/generated-dists/centos8s/bootstrap.sh
index 6a76d40d70e..4b2c62c66d9 100755
--- a/bootstrap/generated-dists/centos8s/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8s/bootstrap.sh
@@ -82,7 +82,6 @@ yum install -y \
     perl \
     perl-Archive-Tar \
     perl-ExtUtils-MakeMaker \
-    perl-JSON \
     perl-Parse-Yapp \
     perl-Test-Simple \
     perl-generators \
diff --git a/bootstrap/generated-dists/centos8s/packages.yml b/bootstrap/generated-dists/centos8s/packages.yml
index 49455ff3be2..f416dea4f5e 100644
--- a/bootstrap/generated-dists/centos8s/packages.yml
+++ b/bootstrap/generated-dists/centos8s/packages.yml
@@ -64,7 +64,6 @@ packages:
   - perl
   - perl-Archive-Tar
   - perl-ExtUtils-MakeMaker
-  - perl-JSON
   - perl-Parse-Yapp
   - perl-Test-Simple
   - perl-generators
diff --git a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
index bee0897803e..6d9fd592fd9 100755
--- a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
@@ -57,7 +57,6 @@ apt-get -y install \
     libicu-dev \
     libjansson-dev \
     libjs-jquery \
-    libjson-perl \
     libkeyutils-dev \
     libkrb5-dev \
     libldap2-dev \
diff --git a/bootstrap/generated-dists/debian11-32bit/packages.yml b/bootstrap/generated-dists/debian11-32bit/packages.yml
index 07f12047814..97e92fea247 100644
--- a/bootstrap/generated-dists/debian11-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian11-32bit/packages.yml
@@ -46,7 +46,6 @@ packages:
   - libicu-dev
   - libjansson-dev
   - libjs-jquery
-  - libjson-perl
   - libkeyutils-dev
   - libkrb5-dev
   - libldap2-dev
diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh
index bee0897803e..6d9fd592fd9 100755
--- a/bootstrap/generated-dists/debian11/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11/bootstrap.sh
@@ -57,7 +57,6 @@ apt-get -y install \
     libicu-dev \
     libjansson-dev \
     libjs-jquery \
-    libjson-perl \
     libkeyutils-dev \
     libkrb5-dev \
     libldap2-dev \
diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11/packages.yml
index 07f12047814..97e92fea247 100644
--- a/bootstrap/generated-dists/debian11/packages.yml
+++ b/bootstrap/generated-dists/debian11/packages.yml
@@ -46,7 +46,6 @@ packages:
   - libicu-dev
   - libjansson-dev
   - libjs-jquery
-  - libjson-perl
   - libkeyutils-dev
   - libkrb5-dev
   - libldap2-dev
diff --git a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
index 677fb9d8727..d6f53c29f8e 100755
--- a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
@@ -57,7 +57,6 @@ apt-get -y install \
     libicu-dev \
     libjansson-dev \
     libjs-jquery \
-    libjson-perl \
     libkeyutils-dev \
     libkrb5-dev \
     libldap2-dev \
diff --git a/bootstrap/generated-dists/debian12-32bit/packages.yml b/bootstrap/generated-dists/debian12-32bit/packages.yml
index 2514914d810..a9547d57380 100644
--- a/bootstrap/generated-dists/debian12-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian12-32bit/packages.yml
@@ -46,7 +46,6 @@ packages:
   - libicu-dev
   - libjansson-dev
   - libjs-jquery
-  - libjson-perl
   - libkeyutils-dev
   - libkrb5-dev
   - libldap2-dev
diff --git a/bootstrap/generated-dists/debian12/bootstrap.sh b/bootstrap/generated-dists/debian12/bootstrap.sh
index 677fb9d8727..d6f53c29f8e 100755
--- a/bootstrap/generated-dists/debian12/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12/bootstrap.sh
@@ -57,7 +57,6 @@ apt-get -y install \
     libicu-dev \
     libjansson-dev \
     libjs-jquery \
-    libjson-perl \
     libkeyutils-dev \
     libkrb5-dev \
     libldap2-dev \
diff --git a/bootstrap/generated-dists/debian12/packages.yml b/bootstrap/generated-dists/debian12/packages.yml
index 2514914d810..a9547d57380 100644
--- a/bootstrap/generated-dists/debian12/packages.yml
+++ b/bootstrap/generated-dists/debian12/packages.yml
@@ -46,7 +46,6 @@ packages:
   - libicu-dev
   - libjansson-dev
   - libjs-jquery
-  - libjson-perl
   - libkeyutils-dev
   - libkrb5-dev
   - libldap2-dev
diff --git a/bootstrap/generated-dists/fedora38/bootstrap.sh b/bootstrap/generated-dists/fedora38/bootstrap.sh
index 2b43dfc4e04..e3b36468ca5 100755
--- a/bootstrap/generated-dists/fedora38/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora38/bootstrap.sh
@@ -22,6 +22,7 @@ dnf install -y \
     bison \
     ccache \
     chrpath \
+    codespell \
     crypto-policies-scripts \
     cups-devel \
     curl \
@@ -79,8 +80,6 @@ dnf install -y \
     perl \
     perl-Archive-Tar \
     perl-ExtUtils-MakeMaker \
-    perl-JSON \
-    perl-JSON-Parse \
     perl-Parse-Yapp \
     perl-Test-Base \
     perl-generators \
diff --git a/bootstrap/generated-dists/fedora38/packages.yml b/bootstrap/generated-dists/fedora38/packages.yml
index c5f9bc50574..1fbe3988e07 100644
--- a/bootstrap/generated-dists/fedora38/packages.yml
+++ b/bootstrap/generated-dists/fedora38/packages.yml
@@ -11,6 +11,7 @@ packages:
   - bison
   - ccache
   - chrpath
+  - codespell
   - crypto-policies-scripts
   - cups-devel
   - curl
@@ -68,8 +69,6 @@ packages:
   - perl
   - perl-Archive-Tar
   - perl-ExtUtils-MakeMaker
-  - perl-JSON
-  - perl-JSON-Parse
   - perl-Parse-Yapp
   - perl-Test-Base
   - perl-generators
diff --git a/bootstrap/generated-dists/opensuse155/bootstrap.sh b/bootstrap/generated-dists/opensuse155/bootstrap.sh
index b82d1b61577..45d11ef6c4b 100755
--- a/bootstrap/generated-dists/opensuse155/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse155/bootstrap.sh
@@ -22,6 +22,7 @@ zypper --non-interactive install \
     bison \
     ccache \
     chrpath \
+    codespell \
     crypto-policies-scripts \
     cups-devel \
     curl \
@@ -76,8 +77,6 @@ zypper --non-interactive install \
     perl \
     perl-Archive-Tar-Wrapper \
     perl-ExtUtils-MakeMaker \
-    perl-JSON \
-    perl-JSON-XS \
     perl-Parse-Yapp \
     perl-Test-Base \
     pkgconfig \
diff --git a/bootstrap/generated-dists/opensuse155/packages.yml b/bootstrap/generated-dists/opensuse155/packages.yml
index 93de86726a4..519b62c33a9 100644
--- a/bootstrap/generated-dists/opensuse155/packages.yml
+++ b/bootstrap/generated-dists/opensuse155/packages.yml
@@ -10,6 +10,7 @@ packages:
   - bison
   - ccache
   - chrpath
+  - codespell
   - crypto-policies-scripts
   - cups-devel
   - curl
@@ -64,8 +65,6 @@ packages:
   - perl
   - perl-Archive-Tar-Wrapper
   - perl-ExtUtils-MakeMaker
-  - perl-JSON
-  - perl-JSON-XS
   - perl-Parse-Yapp
   - perl-Test-Base
   - pkgconfig
diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
index 78de9565b88..10276208d68 100755
--- a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
@@ -58,7 +58,6 @@ apt-get -y install \
     libicu-dev \
     libjansson-dev \
     libjs-jquery \
-    libjson-perl \
     libkeyutils-dev \
     libkrb5-dev \
     libldap2-dev \
diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
index bef96d0280f..2544f9cf8f5 100644
--- a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
@@ -47,7 +47,6 @@ packages:
   - libicu-dev
   - libjansson-dev
   - libjs-jquery
-  - libjson-perl
   - libkeyutils-dev
   - libkrb5-dev
   - libldap2-dev
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 78de9565b88..10276208d68 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -58,7 +58,6 @@ apt-get -y install \
     libicu-dev \
     libjansson-dev \
     libjs-jquery \
-    libjson-perl \
     libkeyutils-dev \
     libkrb5-dev \
     libldap2-dev \
diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index bef96d0280f..2544f9cf8f5 100644
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -47,7 +47,6 @@ packages:
   - libicu-dev
   - libjansson-dev
   - libjs-jquery
-  - libjson-perl
   - libkeyutils-dev
   - libkrb5-dev
   - libldap2-dev
diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index 78de9565b88..10276208d68 100755
--- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -58,7 +58,6 @@ apt-get -y install \
     libicu-dev \
     libjansson-dev \
     libjs-jquery \
-    libjson-perl \
     libkeyutils-dev \
     libkrb5-dev \
     libldap2-dev \
diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml b/bootstrap/generated-dists/ubuntu2004/packages.yml
index bef96d0280f..2544f9cf8f5 100644
--- a/bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2004/packages.yml
@@ -47,7 +47,6 @@ packages:
   - libicu-dev
   - libjansson-dev
   - libjs-jquery
-  - libjson-perl
   - libkeyutils-dev
   - libkrb5-dev
   - libldap2-dev
diff --git a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
index 5375052a438..d8a7a72178f 100755
--- a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
@@ -58,7 +58,6 @@ apt-get -y install \
     libicu-dev \
     libjansson-dev \
     libjs-jquery \
-    libjson-perl \
     libkeyutils-dev \
     libkrb5-dev \
     libldap2-dev \
diff --git a/bootstrap/generated-dists/ubuntu2204/packages.yml b/bootstrap/generated-dists/ubuntu2204/packages.yml
index eee8d9cdfd4..a22a4100fc6 100644
--- a/bootstrap/generated-dists/ubuntu2204/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2204/packages.yml
@@ -47,7 +47,6 @@ packages:
   - libicu-dev
   - libjansson-dev
   - libjs-jquery
-  - libjson-perl
   - libkeyutils-dev
   - libkrb5-dev
   - libldap2-dev
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 11ab035f572..786d4e7ebb5 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-190a74ee9628f298961d890ba37fcc7d213daae2
+21a93787675107f010836bbfa5e8542c272bc4b0
diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
index 17a0fe906ac..f2b8e1e58bf 100644
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -717,13 +717,13 @@ class RawKerberosTest(TestCase):
         tkt_sig_support = samba.tests.env_get_var_value('TKT_SIG_SUPPORT',
                                                         allow_missing=True)
         if tkt_sig_support is None:
-            tkt_sig_support = '0'
+            tkt_sig_support = '1'
         cls.tkt_sig_support = bool(int(tkt_sig_support))
 
         full_sig_support = samba.tests.env_get_var_value('FULL_SIG_SUPPORT',
                                                          allow_missing=True)
         if full_sig_support is None:
-            full_sig_support = '0'
+            full_sig_support = '1'
         cls.full_sig_support = bool(int(full_sig_support))
 
         expect_pac = samba.tests.env_get_var_value('EXPECT_PAC',
diff --git a/selftest/knownfail_mit_kdc b/selftest/knownfail_mit_kdc
index 6f4df9771ca..334137b8848 100644
--- a/selftest/knownfail_mit_kdc
+++ b/selftest/knownfail_mit_kdc
@@ -9,6 +9,39 @@
 ^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_logon_hours.fl2008r2dc
 ^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_logon_hours_wrong_password.fl2003dc
 ^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_logon_hours_wrong_password.fl2008r2dc
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes128_aes256_dummy_pac_False\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes128_aes256_dummy_pac_None\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes128_aes256_dummy_pac_True\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes128_aes256_pac_False\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes128_aes256_pac_None\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes128_aes256_pac_True\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes128_dummy_aes256_pac_False\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes128_dummy_aes256_pac_None\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes128_dummy_aes256_pac_True\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes128_dummy_pac_False\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes128_dummy_pac_None\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes128_dummy_pac_True\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes128_pac_False\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes128_pac_None\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes128_pac_True\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes256_aes128_dummy_pac_False\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes256_aes128_dummy_pac_None\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes256_aes128_dummy_pac_True\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes256_aes128_pac_False\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes256_aes128_pac_None\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes256_aes128_pac_True\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes256_dummy_aes128_pac_False\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes256_dummy_aes128_pac_None\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_aes256_dummy_aes128_pac_True\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_dummy_aes128_aes256_pac_False\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_dummy_aes128_aes256_pac_None\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_dummy_aes128_aes256_pac_True\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_dummy_aes128_pac_False\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_dummy_aes128_pac_None\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_dummy_aes128_pac_True\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_dummy_aes256_aes128_pac_False\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_dummy_aes256_aes128_pac_None\(fl2003dc\)
+^samba.tests.krb5.as_req_tests.samba.tests.krb5.as_req_tests.AsReqKerberosTests.test_as_req_no_preauth_dummy_aes256_aes128_pac_True\(fl2003dc\)
 #
 # Currently MOST but not quite all the Canonicalization tests fail on the
 # MIT KDC
@@ -281,36 +314,11 @@ samba.tests.krb5.as_canonicalization_tests.samba.tests.krb5.as_canonicalization_
 #
 # PAC tests
 #
-^samba4.blackbox.pkinit_pac.STEP1 remote.pac verification.ad_dc:local
 ^samba4.blackbox.pkinit_pac.netr-bdc-aes.verify-sig-aes.ad_dc:local
 ^samba4.blackbox.pkinit_pac.netr-mem-aes.s4u2proxy-aes.ad_dc:local
 ^samba4.blackbox.pkinit_pac.netr-mem-aes.verify-sig-aes.ad_dc:local
 ^samba4.blackbox.pkinit_pac.netr-mem-arcfour.s4u2proxy-arcfour.ad_dc:local
 ^samba4.blackbox.pkinit_pac.netr-mem-arcfour.verify-sig-arcfour.ad_dc:local
-^samba4.rpc.pac on ncacn_np.netr-bdc-aes.verify-sig-aes.fl2000dc
-^samba4.rpc.pac on ncacn_np.netr-bdc-aes.verify-sig-aes.fl2003dc
-^samba4.rpc.pac on ncacn_np.netr-bdc-aes.verify-sig-aes.fl2008dc
-^samba4.rpc.pac on ncacn_np.netr-bdc-aes.verify-sig-aes.fl2008r2dc
-^samba4.rpc.pac on ncacn_np.netr-bdc-arcfour.verify-sig-arcfour.fl2000dc
-^samba4.rpc.pac on ncacn_np.netr-bdc-arcfour.verify-sig-arcfour.fl2003dc
-^samba4.rpc.pac on ncacn_np.netr-bdc-arcfour.verify-sig-arcfour.fl2008dc
-^samba4.rpc.pac on ncacn_np.netr-bdc-arcfour.verify-sig-arcfour.fl2008r2dc


-- 
Samba Shared Repository

More information about the samba-cvs mailing list