The branch, master has been updated via e38f864017a gitlab-ci: Update Fedora to version 38 via fad7f77d161 selftest:knownfail: Update S4U knownfail for MIT KRB5 1.20 via 60f9396a7d2 wafsamba: Normalize strings in gdb output when comparing ABI via b5e9c2bc0ed s3:torture: Fix possible array out of bounds access via 732efb3d962 s3:torture: Remove trailing white spaces in locktest2.c via 0c6fb4bfb01 dfs_server: Fix debug statement if searched_site is NULL via 3e6a6c00cc0 lib:krb5_wrap: Fix debug statements when princ_s is NULL from 8027283dd7c tests: Test ldap whoami exop
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit e38f864017a06cab61ad878db8bca02b26f2e0d5 Author: Andreas Schneider <a...@samba.org> Date: Thu Apr 20 08:25:31 2023 +0200 gitlab-ci: Update Fedora to version 38 Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Andrew Bartlett <abart...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Thu Apr 27 08:22:58 UTC 2023 on atb-devel-224 commit fad7f77d161e0466edfb58d3ca5968e1a4dc1319 Author: Andreas Schneider <a...@samba.org> Date: Tue Apr 25 07:50:55 2023 +0200 selftest:knownfail: Update S4U knownfail for MIT KRB5 1.20 Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit 60f9396a7d2211b55d3d91196561678a9f9f6942 Author: Alexander Bokovoy <a...@redhat.com> Date: Mon Apr 24 14:29:49 2023 +0200 wafsamba: Normalize strings in gdb output when comparing ABI This fixes an issue with gdb >= 13: libndr.so: symbol ndr_transfer_syntax_ndr64 has changed old_signature: uuid = { time_low = 1903232307, time_mid = 48826, time_hi_and_version = 18743, clock_seq = "\203\031", node = "\265\333\357\234\314\066" }, if_version = 1 new_signature: uuid = { time_low = 1903232307, time_mid = 48826, time_hi_and_version = 18743, clock_seq = "\203\031", node = "\265\333\357\234\3146" }, if_version = 1 \314\066 and \3146 are the same as \066 translates into the char '6'. In order to address this we should do byte comparison in python. Pair-Programmed-With: Andreas Schneider <a...@samba.org> Signed-off-by: Andreas Schneider <a...@samba.org> Signed-off-by: Alexander Bokovoy <a...@redhat.com> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit b5e9c2bc0ed5d24aa994a3f278e31aba4d4f58a6 Author: Andreas Schneider <a...@samba.org> Date: Thu Apr 20 13:29:27 2023 +0200 s3:torture: Fix possible array out of bounds access In function ‘test_one’, inlined from ‘retest’ at source3/torture/locktest2.c:401:8: source3/torture/locktest2.c:331:37: error: array subscript 2 is above array bounds of ‘int[2][2][2]’ [-Werror=array-bounds=] 331 | fnum[server][fstype][conn][f] = try_open(cli[server][conn], nfs[server], fstype, FILENAME, | ~~~~~~~~~~~~^~~~~~~~ source3/torture/locktest2.c: In function ‘retest’: source3/torture/locktest2.c:390:23: note: while referencing ‘fnum’ 390 | int fnum[NSERVERS][NUMFSTYPES][NCONNECTIONS][NFILES], | ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In function ‘test_one’, inlined from ‘retest’ at source3/torture/locktest2.c:401:8: source3/torture/locktest2.c:316:62: error: array subscript 2 is above array bounds of ‘int[2][2][2]’ [-Werror=array-bounds=] 316 | fnum[server][fstype][conn][f], | ~~~~~~~~~~~~^~~~~~~~ source3/torture/locktest2.c: In function ‘retest’: source3/torture/locktest2.c:390:23: note: while referencing ‘fnum’ 390 | int fnum[NSERVERS][NUMFSTYPES][NCONNECTIONS][NFILES], | ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In function ‘test_one’, inlined from ‘retest’ at source3/torture/locktest2.c:401:8: source3/torture/locktest2.c:300:60: error: array subscript 2 is above array bounds of ‘int[2][2][2]’ [-Werror=array-bounds=] 300 | fnum[server][fstype][conn][f], | ~~~~~~~~~~~~^~~~~~~~ source3/torture/locktest2.c: In function ‘retest’: source3/torture/locktest2.c:390:23: note: while referencing ‘fnum’ 390 | int fnum[NSERVERS][NUMFSTYPES][NCONNECTIONS][NFILES], | ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit 732efb3d9629ba0af602066f134e6519efadcef5 Author: Andreas Schneider <a...@samba.org> Date: Thu Apr 20 13:28:59 2023 +0200 s3:torture: Remove trailing white spaces in locktest2.c Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit 0c6fb4bfb01254d565d5b8308b24447d926b5085 Author: Andreas Schneider <a...@samba.org> Date: Thu Apr 20 13:09:26 2023 +0200 dfs_server: Fix debug statement if searched_site is NULL In file included from source4/include/includes.h:61, from dfs_server/dfs_server_ad.c:21: dfs_server/dfs_server_ad.c: In function ‘get_dcs.constprop’: lib/util/debug.h:200:12: error: ‘%s’ directive argument is null [-Werror=format-overflow=] 200 | && (dbgtext body) ) | ~^~~~~~~~~~~~~ dfs_server/dfs_server_ad.c:462:25: note: in expansion of macro ‘DEBUG’ 462 | DEBUG(2,(__location__ ": Site: %s %s\n", | ^~~~~ Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit 3e6a6c00cc09fedefa5c02f24d7852fea9a4c484 Author: Andreas Schneider <a...@samba.org> Date: Thu Apr 20 10:42:54 2023 +0200 lib:krb5_wrap: Fix debug statements when princ_s is NULL In file included from source4/include/includes.h:61, from lib/krb5_wrap/krb5_samba.c:23: lib/krb5_wrap/krb5_samba.c: In function ‘smb_krb5_kt_seek_and_delete_old_entries’: lib/util/debug.h:200:12: error: ‘%s’ directive argument is null [-Werror=format-overflow=] 200 | && (dbgtext body) ) | ~^~~~~~~~~~~~~ lib/krb5_wrap/krb5_samba.c:1753:25: note: in expansion of macro ‘DEBUG’ 1753 | DEBUG(5, (__location__ ": Saving previous (kvno %d) " | ^~~~~ lib/util/debug.h:200:12: error: ‘%s’ directive argument is null [-Werror=format-overflow=] 200 | && (dbgtext body) ) | ~^~~~~~~~~~~~~ lib/krb5_wrap/krb5_samba.c:1763:25: note: in expansion of macro ‘DEBUG’ 1763 | DEBUG(5, (__location__ ": Saving entry with kvno [%d] " | ^~~~~ lib/util/debug.h:200:12: error: ‘%s’ directive argument is null [-Werror=format-overflow=] 200 | && (dbgtext body) ) | ~^~~~~~~~~~~~~ lib/krb5_wrap/krb5_samba.c:1769:17: note: in expansion of macro ‘DEBUG’ 1769 | DEBUG(5, (__location__ ": Found old entry for principal: %s " | ^~~~~ lib/util/debug.h:200:12: error: ‘%s’ directive argument is null [-Werror=format-overflow=] 200 | && (dbgtext body) ) | ~^~~~~~~~~~~~~ lib/krb5_wrap/krb5_samba.c:1787:17: note: in expansion of macro ‘DEBUG’ 1787 | DEBUG(5, (__location__ ": removed old entry for principal: " | ^~~~~ Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Andrew Bartlett <abart...@samba.org> ----------------------------------------------------------------------- Summary of changes: .gitlab-ci-main.yml | 44 ++++------------ bootstrap/.gitlab-ci.yml | 5 +- bootstrap/config.py | 20 +++----- bootstrap/generated-dists/Vagrantfile | 17 ++----- bootstrap/generated-dists/centos7/bootstrap.sh | 1 + bootstrap/generated-dists/centos7/packages.yml | 1 + bootstrap/generated-dists/centos8s/bootstrap.sh | 1 + bootstrap/generated-dists/centos8s/packages.yml | 1 + .../{debian11 => fedora38}/Dockerfile | 2 +- .../{fedora37 => fedora38}/bootstrap.sh | 5 +- .../{centos7 => fedora38}/locale.sh | 0 .../{fedora37 => fedora38}/packages.yml | 1 + bootstrap/generated-dists/opensuse154/bootstrap.sh | 1 + bootstrap/generated-dists/opensuse154/packages.yml | 1 + bootstrap/sha1sum.txt | 2 +- buildtools/wafsamba/samba_abi.py | 3 +- dfs_server/dfs_server_ad.c | 7 ++- lib/krb5_wrap/krb5_samba.c | 13 +++-- selftest/knownfail_mit_kdc | 17 +++++-- selftest/knownfail_mit_kdc_pre_1_20 | 6 +-- source3/torture/locktest2.c | 58 ++++++++++++---------- 21 files changed, 96 insertions(+), 110 deletions(-) copy bootstrap/generated-dists/{debian11 => fedora38}/Dockerfile (92%) copy bootstrap/generated-dists/{fedora37 => fedora38}/bootstrap.sh (95%) copy bootstrap/generated-dists/{centos7 => fedora38}/locale.sh (100%) copy bootstrap/generated-dists/{fedora37 => fedora38}/packages.yml (97%) Changeset truncated at 500 lines: diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index e725bfd0775..4208cbcc104 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: 790c229c42a67336099420d137fa9dc9974a133a + SAMBA_CI_CONTAINER_TAG: cfddaa8d36c3f512827bd96fe05c30f7f8337f4b # # We use the ubuntu2204 image as default as # it matches what we have on atb-devel-224 @@ -64,8 +64,7 @@ variables: SAMBA_CI_CONTAINER_IMAGE_ubuntu2204: ubuntu2204 SAMBA_CI_CONTAINER_IMAGE_debian11: debian11 SAMBA_CI_CONTAINER_IMAGE_opensuse154: opensuse154 - SAMBA_CI_CONTAINER_IMAGE_fedora37: fedora37 - SAMBA_CI_CONTAINER_IMAGE_f37mit120: f37mit120 + SAMBA_CI_CONTAINER_IMAGE_fedora38: fedora38 SAMBA_CI_CONTAINER_IMAGE_centos7: centos7 SAMBA_CI_CONTAINER_IMAGE_centos8s: centos8s @@ -263,33 +262,18 @@ samba-def-build: samba-mit-build: extends: .shared_template_build_only variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37} - stage: build_first - -samba-mit120-build: - extends: .shared_template_build_only - variables: - AUTOBUILD_JOB_NAME: samba-mit-build - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f37mit120} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora38} stage: build_first .needs_samba-mit-build: extends: .shared_template_test_only variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora38} needs: - job: samba-mit-build artifacts: true - job: samba-shellcheck -.needs_samba-mit120-build: - extends: .shared_template_test_only - variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_f37mit120} - needs: - - job: samba-mit120-build - artifacts: true - samba-h5l-build: extends: .shared_template_build_only @@ -332,7 +316,7 @@ samba: samba-mitkrb5: extends: .shared_template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora38} samba-minimal-smbd: extends: .shared_template @@ -402,13 +386,13 @@ samba-addc-mit-4b: samba-fips: extends: .shared_template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora38} samba-shellcheck: extends: .shared_template needs: variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora38} stage: build_first .private_test_only: @@ -435,11 +419,6 @@ samba-shellcheck: - .needs_samba-mit-build - .private_test_only -.needs_samba-mit120-build-private: - extends: - - .needs_samba-mit120-build - - .private_test_only - .needs_samba-h5l-build-private: extends: - .needs_samba-h5l-build @@ -482,11 +461,6 @@ samba-nt4: samba-addc-mit-1: extends: .needs_samba-mit-build-private -samba-addc-mit120: - extends: .needs_samba-mit120-build-private - variables: - AUTOBUILD_JOB_NAME: samba-addc-mit-1 - samba-no-opath1: extends: .needs_samba-no-opath-build-private @@ -662,10 +636,10 @@ centos8s-samba-o3: variables: SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_centos8s} -fedora37-samba-o3: +fedora38-samba-o3: extends: .samba-o3-template variables: - SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora37} + SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora38} # # Keep the samba-o3 sections at the end ... diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml index be1e14b4b14..ef72d1538f1 100644 --- a/bootstrap/.gitlab-ci.yml +++ b/bootstrap/.gitlab-ci.yml @@ -105,10 +105,7 @@ ubuntu2204: debian11: extends: .build_image_template -fedora37: - extends: .build_image_template - -f37mit120: +fedora38: extends: .build_image_template centos8s: diff --git a/bootstrap/config.py b/bootstrap/config.py index d2ad4503430..fd1753fb3e1 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -135,6 +135,7 @@ PKGS = [ ('', 'mold'), ('', 'ShellCheck'), ('', 'shfmt'), + ('', 'crypto-policies-scripts'), ('python3', 'python3'), ('python3-cryptography', 'python3-cryptography'), # for krb5 tests @@ -268,6 +269,8 @@ dnf install -y \ {pkgs} dnf clean all + +update-crypto-policies --set DEFAULT:AD-SUPPORT """ DNF_BOOTSTRAP_MIT = r""" @@ -508,9 +511,9 @@ RPM_DISTS = { 'shfmt': '', } }, - 'fedora37': { - 'docker_image': 'quay.io/fedora/fedora:37', - 'vagrant_box': 'fedora/37-cloud-base', + 'fedora38': { + 'docker_image': 'quay.io/fedora/fedora:38', + 'vagrant_box': 'fedora/38-cloud-base', 'bootstrap': DNF_BOOTSTRAP, 'replace': { 'lsb-release': 'redhat-lsb', @@ -519,17 +522,6 @@ RPM_DISTS = { 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available } }, - 'f37mit120': { - 'docker_image': 'quay.io/fedora/fedora:37', - 'vagrant_box': 'fedora/37-cloud-base', - 'bootstrap': DNF_BOOTSTRAP_MIT, - 'replace': { - 'lsb-release': 'redhat-lsb', - 'perl-FindBin': '', - 'python3-iso8601': 'python3-dateutil', - 'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available - } - }, 'opensuse154': { 'docker_image': 'opensuse/leap:15.4', 'vagrant_box': 'opensuse/openSUSE-15.4-x86_64', diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile index d67db745c8d..e744511d360 100644 --- a/bootstrap/generated-dists/Vagrantfile +++ b/bootstrap/generated-dists/Vagrantfile @@ -31,18 +31,11 @@ Vagrant.configure("2") do |config| v.vm.provision :shell, path: "debian11/locale.sh" end - config.vm.define "f37mit120" do |v| - v.vm.box = "fedora/37-cloud-base" - v.vm.hostname = "f37mit120" - v.vm.provision :shell, path: "f37mit120/bootstrap.sh" - v.vm.provision :shell, path: "f37mit120/locale.sh" - end - - config.vm.define "fedora37" do |v| - v.vm.box = "fedora/37-cloud-base" - v.vm.hostname = "fedora37" - v.vm.provision :shell, path: "fedora37/bootstrap.sh" - v.vm.provision :shell, path: "fedora37/locale.sh" + config.vm.define "fedora38" do |v| + v.vm.box = "fedora/38-cloud-base" + v.vm.hostname = "fedora38" + v.vm.provision :shell, path: "fedora38/bootstrap.sh" + v.vm.provision :shell, path: "fedora38/locale.sh" end config.vm.define "opensuse154" do |v| diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh index ad8488b596f..c8bbd9d62f1 100755 --- a/bootstrap/generated-dists/centos7/bootstrap.sh +++ b/bootstrap/generated-dists/centos7/bootstrap.sh @@ -25,6 +25,7 @@ yum install -y \ ccache \ chrpath \ compat-gnutls37-devel \ + crypto-policies-scripts \ cups-devel \ curl \ dbus-devel \ diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml index 09b3d4b3f06..9b0f5285f19 100644 --- a/bootstrap/generated-dists/centos7/packages.yml +++ b/bootstrap/generated-dists/centos7/packages.yml @@ -11,6 +11,7 @@ packages: - ccache - chrpath - compat-gnutls37-devel + - crypto-policies-scripts - cups-devel - curl - dbus-devel diff --git a/bootstrap/generated-dists/centos8s/bootstrap.sh b/bootstrap/generated-dists/centos8s/bootstrap.sh index 0dc04a843dd..6a1df119535 100755 --- a/bootstrap/generated-dists/centos8s/bootstrap.sh +++ b/bootstrap/generated-dists/centos8s/bootstrap.sh @@ -28,6 +28,7 @@ yum install -y \ bison \ ccache \ chrpath \ + crypto-policies-scripts \ cups-devel \ curl \ dbus-devel \ diff --git a/bootstrap/generated-dists/centos8s/packages.yml b/bootstrap/generated-dists/centos8s/packages.yml index 5da7f2ac0d9..0bae860437b 100644 --- a/bootstrap/generated-dists/centos8s/packages.yml +++ b/bootstrap/generated-dists/centos8s/packages.yml @@ -10,6 +10,7 @@ packages: - bison - ccache - chrpath + - crypto-policies-scripts - cups-devel - curl - dbus-devel diff --git a/bootstrap/generated-dists/debian11/Dockerfile b/bootstrap/generated-dists/fedora38/Dockerfile similarity index 92% copy from bootstrap/generated-dists/debian11/Dockerfile copy to bootstrap/generated-dists/fedora38/Dockerfile index b7a46ca53e5..10002774e20 100644 --- a/bootstrap/generated-dists/debian11/Dockerfile +++ b/bootstrap/generated-dists/fedora38/Dockerfile @@ -3,7 +3,7 @@ # See also bootstrap/config.py # -FROM debian:11 +FROM quay.io/fedora/fedora:38 # pass in with --build-arg while build ARG SHA1SUM diff --git a/bootstrap/generated-dists/fedora37/bootstrap.sh b/bootstrap/generated-dists/fedora38/bootstrap.sh similarity index 95% copy from bootstrap/generated-dists/fedora37/bootstrap.sh copy to bootstrap/generated-dists/fedora38/bootstrap.sh index 6cbde6f3411..1e76edbb982 100755 --- a/bootstrap/generated-dists/fedora37/bootstrap.sh +++ b/bootstrap/generated-dists/fedora38/bootstrap.sh @@ -22,6 +22,7 @@ dnf install -y \ bison \ ccache \ chrpath \ + crypto-policies-scripts \ cups-devel \ curl \ dbus-devel \ @@ -120,4 +121,6 @@ dnf install -y \ yum-utils \ zlib-devel -dnf clean all \ No newline at end of file +dnf clean all + +update-crypto-policies --set DEFAULT:AD-SUPPORT \ No newline at end of file diff --git a/bootstrap/generated-dists/centos7/locale.sh b/bootstrap/generated-dists/fedora38/locale.sh similarity index 100% copy from bootstrap/generated-dists/centos7/locale.sh copy to bootstrap/generated-dists/fedora38/locale.sh diff --git a/bootstrap/generated-dists/fedora37/packages.yml b/bootstrap/generated-dists/fedora38/packages.yml similarity index 97% copy from bootstrap/generated-dists/fedora37/packages.yml copy to bootstrap/generated-dists/fedora38/packages.yml index d1e9af5af3d..3b4d6fb3628 100644 --- a/bootstrap/generated-dists/fedora37/packages.yml +++ b/bootstrap/generated-dists/fedora38/packages.yml @@ -11,6 +11,7 @@ packages: - bison - ccache - chrpath + - crypto-policies-scripts - cups-devel - curl - dbus-devel diff --git a/bootstrap/generated-dists/opensuse154/bootstrap.sh b/bootstrap/generated-dists/opensuse154/bootstrap.sh index 33f46c41284..721f7a67a76 100755 --- a/bootstrap/generated-dists/opensuse154/bootstrap.sh +++ b/bootstrap/generated-dists/opensuse154/bootstrap.sh @@ -22,6 +22,7 @@ zypper --non-interactive install \ bison \ ccache \ chrpath \ + crypto-policies-scripts \ cups-devel \ curl \ dbus-1-devel \ diff --git a/bootstrap/generated-dists/opensuse154/packages.yml b/bootstrap/generated-dists/opensuse154/packages.yml index ddb2d37c4b7..18921cf0751 100644 --- a/bootstrap/generated-dists/opensuse154/packages.yml +++ b/bootstrap/generated-dists/opensuse154/packages.yml @@ -10,6 +10,7 @@ packages: - bison - ccache - chrpath + - crypto-policies-scripts - cups-devel - curl - dbus-1-devel diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index 733069047b7..3a6671d4fb8 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -790c229c42a67336099420d137fa9dc9974a133a +cfddaa8d36c3f512827bd96fe05c30f7f8337f4b diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py index 6a8e4bcef00..682f4e897b5 100644 --- a/buildtools/wafsamba/samba_abi.py +++ b/buildtools/wafsamba/samba_abi.py @@ -42,7 +42,8 @@ def normalise_signature(sig): def normalise_varargs(sig): '''cope with older versions of gdb''' sig = re.sub(r',\s\.\.\.', '', sig) - return sig + # Make sure we compare bytes and not strings + return bytes(sig, encoding='utf-8').decode('unicode_escape') def parse_sigs(sigs, abi_match): diff --git a/dfs_server/dfs_server_ad.c b/dfs_server/dfs_server_ad.c index b97d0882f94..f992042966e 100644 --- a/dfs_server/dfs_server_ad.c +++ b/dfs_server/dfs_server_ad.c @@ -459,8 +459,11 @@ static NTSTATUS get_dcs(TALLOC_CTX *ctx, struct ldb_context *ldb, if (searched_site == NULL || strcmp(searched_site, site_name) != 0) { - DEBUG(2,(__location__ ": Site: %s %s\n", - searched_site, site_name)); + DEBUG(2, + (__location__ ": Site: %s %s\n", + searched_site != NULL ? searched_site + : "UNKNOWN", + site_name)); /* * Do all the site but the one of the client diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c index 61fda0e502c..22aeda33026 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c @@ -1752,7 +1752,8 @@ krb5_error_code smb_krb5_kt_seek_and_delete_old_entries(krb5_context context, if (keep_old_kvno && ((kt_entry.vno & 0xff) == (old_kvno & 0xff))) { DEBUG(5, (__location__ ": Saving previous (kvno %d) " "entry for principal: %s.\n", - old_kvno, princ_s)); + old_kvno, + princ_s != NULL ? princ_s : "UNKNOWN")); continue; } @@ -1762,13 +1763,15 @@ krb5_error_code smb_krb5_kt_seek_and_delete_old_entries(krb5_context context, { DEBUG(5, (__location__ ": Saving entry with kvno [%d] " "enctype [%d] for principal: %s.\n", - kvno, kt_entry_enctype, princ_s)); + kvno, kt_entry_enctype, + princ_s != NULL ? princ_s : "UNKNOWN")); continue; } DEBUG(5, (__location__ ": Found old entry for principal: %s " "(kvno %d) - trying to remove it.\n", - princ_s, kt_entry.vno)); + princ_s != NULL ? princ_s : "UNKNOWN", + kt_entry.vno)); ret = krb5_kt_end_seq_get(context, keytab, &cursor); ZERO_STRUCT(cursor); @@ -1785,7 +1788,9 @@ krb5_error_code smb_krb5_kt_seek_and_delete_old_entries(krb5_context context, } DEBUG(5, (__location__ ": removed old entry for principal: " - "%s (kvno %d).\n", princ_s, kt_entry.vno)); + "%s (kvno %d).\n", + princ_s != NULL ? princ_s : "UNKNOWN", + kt_entry.vno)); ret = krb5_kt_start_seq_get(context, keytab, &cursor); if (ret) { diff --git a/selftest/knownfail_mit_kdc b/selftest/knownfail_mit_kdc index 213903fb530..5daca97ef9f 100644 --- a/selftest/knownfail_mit_kdc +++ b/selftest/knownfail_mit_kdc @@ -1437,11 +1437,18 @@ samba.tests.krb5.as_canonicalization_tests.samba.tests.krb5.as_canonicalization_ # # S4U tests # -^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_authentication_asserted_identity.fl2003dc:local -^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_rc4_client_checksum.fl2003dc:local -^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_rodc_issued.fl2003dc:local -^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_service_asserted_identity.fl2003dc:local -^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_s4u2self_asserted_identity.fl2003dc:local +^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_existing_delegation_info\( +^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_missing_client_checksum\( +^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_rc4_client_checksum.ad_dc_default +^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_rodc_issued\( +^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_unkeyed_client_checksum\( +^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_zeroed_client_checksum\( +^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd_existing_delegation_info\( +^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd_missing_client_checksum\( +^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd_rc4_client_checksum\( +^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd_rodc_issued\( +^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd_unkeyed_client_checksum\( +^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd_zeroed_client_checksum\( # # etype tests # diff --git a/selftest/knownfail_mit_kdc_pre_1_20 b/selftest/knownfail_mit_kdc_pre_1_20 index 34de046b646..d84f6de8039 100644 --- a/selftest/knownfail_mit_kdc_pre_1_20 +++ b/selftest/knownfail_mit_kdc_pre_1_20 @@ -152,6 +152,7 @@ samba.tests.krb5.compatability_tests.samba.tests.krb5.compatability_tests.Simple ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_bronze_bit_constrained_delegation_old_checksum\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_bronze_bit_rbcd_old_checksum\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation\( +^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_authentication_asserted_identity\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_existing_delegation_info\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_missing_client_checksum\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_missing_service_checksum\( @@ -160,11 +161,10 @@ samba.tests.krb5.compatability_tests.samba.tests.krb5.compatability_tests.Simple ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_no_service_pac\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_no_service_pac_no_auth_data_required\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_pac_options_rbcd\( +^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_service_asserted_identity\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_unkeyed_client_checksum\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_unkeyed_service_checksum\( -^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_zeroed_client_checksum\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_constrained_delegation_zeroed_service_checksum\( -^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd_missing_client_checksum\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd_missing_service_checksum\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd_no_client_pac_a\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd_no_client_pac_b\( @@ -175,6 +175,7 @@ samba.tests.krb5.compatability_tests.samba.tests.krb5.compatability_tests.Simple ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd_unkeyed_client_checksum\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd_zeroed_client_checksum\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_s4u2self\( +^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_s4u2self_asserted_identity\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_s4u2self_client_not_delegated\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_s4u2self_crc32_unkeyed_checksum\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_s4u2self_forwardable\( @@ -191,7 +192,6 @@ samba.tests.krb5.compatability_tests.samba.tests.krb5.compatability_tests.Simple ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_s4u2self_without_forwardable\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_s4u2self_wrong_sname\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd\( -^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd_existing_delegation_info\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd_no_auth_data_required\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd_rodc_issued\( ^samba.tests.krb5.s4u_tests.samba.tests.krb5.s4u_tests.S4UKerberosTests.test_rbcd_unkeyed_service_checksum\( -- Samba Shared Repository