The branch, master has been updated
via e40c86e970e gp: Fix user apply failure when droping privs
via cd0f9fc7a3a bootstrap: make sure we have gnutls-cli from
gnutls-bin/gnutls-utils
via 62e189825ec bootstrap: force use of LANGUAGE=en_US
via 666a78a41f0 selftest: run tests with LANGUAGE=en_US
via 75ec66c729f third_party/heimdal: Import
lorikeet-heimdal-202306091507 (commit 7d8afc9d7e3d309ddccc2aea6405a8ca6280f6de)
from 23ca540abfd smbd: Remove unused dptr_fill() and dptr_fetch_fsp()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e40c86e970e3e8e76d16d12dcdb334b347d7b438
Author: David Mulder <dmul...@samba.org>
Date: Wed Jun 7 08:29:31 2023 -0600
gp: Fix user apply failure when droping privs
When dropping privileges, gpupdate errored:
gpclass.py:1167: KeyError: "getpwnam(): name not found: <HOSTNAME>
apply_gp was incorrectly passing the hostname
instead of the username.
Signed-off-by: David Mulder <dmul...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Autobuild-User(master): Andrew Bartlett <abart...@samba.org>
Autobuild-Date(master): Sat Jun 10 10:46:28 UTC 2023 on atb-devel-224
commit cd0f9fc7a3aedc772dc98c91d75760c9e17c9ceb
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Jun 9 14:07:06 2023 +0200
bootstrap: make sure we have gnutls-cli from gnutls-bin/gnutls-utils
We'll use it in some upcoming tests...
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 62e189825ec44ed7c021d92e6fea0dd5ab16edfb
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Jun 9 14:02:48 2023 +0200
bootstrap: force use of LANGUAGE=en_US
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 666a78a41f01fca831956b153d7ce0e997b90117
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Jun 9 13:51:56 2023 +0200
selftest: run tests with LANGUAGE=en_US
This is important in order to run /usr/bin/kpasswd from MIT...
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
commit 75ec66c729faad60fa18b9504ba4053b3e2f47bc
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Jun 9 15:14:50 2023 +0200
third_party/heimdal: Import lorikeet-heimdal-202306091507 (commit
7d8afc9d7e3d309ddccc2aea6405a8ca6280f6de)
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci-main.yml | 2 +-
bootstrap/config.py | 5 +-
bootstrap/generated-dists/centos7/Dockerfile | 2 +-
bootstrap/generated-dists/centos7/bootstrap.sh | 1 +
bootstrap/generated-dists/centos7/packages.yml | 1 +
bootstrap/generated-dists/centos8s/Dockerfile | 2 +-
bootstrap/generated-dists/centos8s/bootstrap.sh | 1 +
bootstrap/generated-dists/centos8s/packages.yml | 1 +
bootstrap/generated-dists/debian11/Dockerfile | 2 +-
bootstrap/generated-dists/debian11/bootstrap.sh | 1 +
bootstrap/generated-dists/debian11/packages.yml | 1 +
bootstrap/generated-dists/fedora38/Dockerfile | 2 +-
bootstrap/generated-dists/fedora38/bootstrap.sh | 1 +
bootstrap/generated-dists/fedora38/packages.yml | 1 +
bootstrap/generated-dists/opensuse154/Dockerfile | 2 +-
bootstrap/generated-dists/opensuse154/bootstrap.sh | 1 +
bootstrap/generated-dists/opensuse154/packages.yml | 1 +
.../generated-dists/ubuntu1804-32bit/Dockerfile | 2 +-
.../generated-dists/ubuntu1804-32bit/bootstrap.sh | 1 +
.../generated-dists/ubuntu1804-32bit/packages.yml | 1 +
bootstrap/generated-dists/ubuntu1804/Dockerfile | 2 +-
bootstrap/generated-dists/ubuntu1804/bootstrap.sh | 1 +
bootstrap/generated-dists/ubuntu1804/packages.yml | 1 +
bootstrap/generated-dists/ubuntu2004/Dockerfile | 2 +-
bootstrap/generated-dists/ubuntu2004/bootstrap.sh | 1 +
bootstrap/generated-dists/ubuntu2004/packages.yml | 1 +
bootstrap/generated-dists/ubuntu2204/Dockerfile | 2 +-
bootstrap/generated-dists/ubuntu2204/bootstrap.sh | 1 +
bootstrap/generated-dists/ubuntu2204/packages.yml | 1 +
bootstrap/sha1sum.txt | 2 +-
python/samba/gp/gpclass.py | 2 +-
selftest/selftest.pl | 1 +
third_party/heimdal/.github/workflows/coverity.yml | 4 +-
.../.github/workflows/linux-mit-interop.yml | 4 +-
third_party/heimdal/.github/workflows/linux.yml | 6 +-
third_party/heimdal/.github/workflows/osx.yml | 2 +-
.../heimdal/.github/workflows/scanbuild.yml | 4 +-
third_party/heimdal/.github/workflows/ubsan.yml | 6 +-
third_party/heimdal/.github/workflows/valgrind.yml | 4 +-
third_party/heimdal/admin/ktutil.1 | 51 +++
third_party/heimdal/cf/crypto.m4 | 33 +-
third_party/heimdal/doc/setup.texi | 17 +
third_party/heimdal/kadmin/kadmin-commands.in | 2 +-
third_party/heimdal/kadmin/kadmin.1 | 81 +++-
third_party/heimdal/kdc/bx509d.c | 2 +-
third_party/heimdal/kdc/ipc_csr_authorizer.c | 2 +-
third_party/heimdal/kdc/kdc-audit.h | 4 +
third_party/heimdal/kdc/kdc_locl.h | 1 +
third_party/heimdal/kdc/kerberos5.c | 503 +++++++++++++++------
third_party/heimdal/kdc/krb5tgs.c | 127 +++---
third_party/heimdal/kdc/mssfu.c | 11 +
third_party/heimdal/kdc/test_csr_authorizer.c | 2 +-
third_party/heimdal/kuser/kinit.1 | 165 +++++++
third_party/heimdal/kuser/kinit.c | 8 +-
third_party/heimdal/lib/asn1/asn1_print.c | 2 +-
third_party/heimdal/lib/asn1/gen.c | 2 +-
third_party/heimdal/lib/base/config_file.c | 32 +-
third_party/heimdal/lib/base/warn.c | 2 +-
.../heimdal/lib/gssapi/mech/gss_mech_switch.c | 3 +-
.../heimdal/lib/gssapi/netlogon/import_name.c | 4 +-
third_party/heimdal/lib/hcrypto/test_dh.c | 6 +-
third_party/heimdal/lib/hdb/hdb.c | 2 +-
third_party/heimdal/lib/hx509/file.c | 2 +-
third_party/heimdal/lib/kadm5/ipropd_slave.c | 2 +-
third_party/heimdal/lib/kadm5/marshall.c | 8 +-
third_party/heimdal/lib/krb5/cache.c | 2 +-
third_party/heimdal/lib/krb5/crypto.c | 28 +-
third_party/heimdal/lib/krb5/dcache.c | 2 +-
third_party/heimdal/lib/krb5/principal.c | 6 +-
third_party/heimdal/lib/roken/qsort.c | 4 +-
third_party/heimdal/lib/roken/rtbl.c | 2 +-
third_party/heimdal/lib/roken/snprintf.c | 5 +-
third_party/heimdal/lib/wind/test-normalize.c | 17 +-
73 files changed, 908 insertions(+), 310 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 279c1087789..798192f9b04 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: 6f4e1c3f1eb3b3236ae793c11def2135386a0ee9
+ SAMBA_CI_CONTAINER_TAG: cf0a5476a4f13d449a7542d01d225dc2aef2a333
#
# We use the ubuntu2204 image as default as
# it matches what we have on atb-devel-224
diff --git a/bootstrap/config.py b/bootstrap/config.py
index c67ab9184ab..17c608ca393 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -97,6 +97,7 @@ PKGS = [
('libgpgme11-dev', 'gpgme-devel'),
# NOTE: Debian 8+ and Ubuntu 14.04+
('libgnutls28-dev', 'gnutls-devel'),
+ ('gnutls-bin', 'gnutls-utils'),
('libtasn1-bin', 'libtasn1-tools'),
('libtasn1-dev', 'libtasn1-devel'),
('', 'quota-devel'),
@@ -389,7 +390,7 @@ RUN useradd -m -U -s /bin/bash samba && \
USER samba
WORKDIR /home/samba
# samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
"""
# Vagrantfile snippet for each dist
@@ -486,6 +487,7 @@ RPM_DISTS = {
'glusterfs-devel': '',
'libcephfs-devel': '',
'gnutls-devel': 'compat-gnutls37-devel',
+ 'gnutls-utils': 'compat-gnutls37-utils',
'liburing-devel': '', # not available
'python3-setproctitle': 'python36-setproctitle',
'tracker-devel': '', # do not install
@@ -549,6 +551,7 @@ RPM_DISTS = {
'python3-markdown': 'python3-Markdown',
'quota-devel': '',
'glusterfs-api-devel': '',
+ 'gnutls-utils': 'gnutls',
'libtasn1-tools': '', # asn1Parser is part of libtasn1
'mold': '',
'shfmt': '',
diff --git a/bootstrap/generated-dists/centos7/Dockerfile
b/bootstrap/generated-dists/centos7/Dockerfile
index ccb46541106..a11c4dbf169 100644
--- a/bootstrap/generated-dists/centos7/Dockerfile
+++ b/bootstrap/generated-dists/centos7/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
USER samba
WORKDIR /home/samba
# samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file
diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh
b/bootstrap/generated-dists/centos7/bootstrap.sh
index c8bbd9d62f1..aa0638e9765 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 \
+ compat-gnutls37-utils \
crypto-policies-scripts \
cups-devel \
curl \
diff --git a/bootstrap/generated-dists/centos7/packages.yml
b/bootstrap/generated-dists/centos7/packages.yml
index 9b0f5285f19..edcc34791ec 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
+ - compat-gnutls37-utils
- crypto-policies-scripts
- cups-devel
- curl
diff --git a/bootstrap/generated-dists/centos8s/Dockerfile
b/bootstrap/generated-dists/centos8s/Dockerfile
index 6f8a883b075..3b5a681118f 100644
--- a/bootstrap/generated-dists/centos8s/Dockerfile
+++ b/bootstrap/generated-dists/centos8s/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
USER samba
WORKDIR /home/samba
# samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file
diff --git a/bootstrap/generated-dists/centos8s/bootstrap.sh
b/bootstrap/generated-dists/centos8s/bootstrap.sh
index 6a1df119535..6a76d40d70e 100755
--- a/bootstrap/generated-dists/centos8s/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8s/bootstrap.sh
@@ -45,6 +45,7 @@ yum install -y \
glusterfs-api-devel \
glusterfs-devel \
gnutls-devel \
+ gnutls-utils \
gpgme-devel \
gzip \
hostname \
diff --git a/bootstrap/generated-dists/centos8s/packages.yml
b/bootstrap/generated-dists/centos8s/packages.yml
index 0bae860437b..49455ff3be2 100644
--- a/bootstrap/generated-dists/centos8s/packages.yml
+++ b/bootstrap/generated-dists/centos8s/packages.yml
@@ -27,6 +27,7 @@ packages:
- glusterfs-api-devel
- glusterfs-devel
- gnutls-devel
+ - gnutls-utils
- gpgme-devel
- gzip
- hostname
diff --git a/bootstrap/generated-dists/debian11/Dockerfile
b/bootstrap/generated-dists/debian11/Dockerfile
index b7a46ca53e5..90a961f5345 100644
--- a/bootstrap/generated-dists/debian11/Dockerfile
+++ b/bootstrap/generated-dists/debian11/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
USER samba
WORKDIR /home/samba
# samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file
diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh
b/bootstrap/generated-dists/debian11/bootstrap.sh
index 1aac852e83e..bee0897803e 100755
--- a/bootstrap/generated-dists/debian11/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11/bootstrap.sh
@@ -31,6 +31,7 @@ apt-get -y install \
gdb \
git \
glusterfs-common \
+ gnutls-bin \
gzip \
heimdal-multidev \
hostname \
diff --git a/bootstrap/generated-dists/debian11/packages.yml
b/bootstrap/generated-dists/debian11/packages.yml
index 1ff63e4b272..07f12047814 100644
--- a/bootstrap/generated-dists/debian11/packages.yml
+++ b/bootstrap/generated-dists/debian11/packages.yml
@@ -20,6 +20,7 @@ packages:
- gdb
- git
- glusterfs-common
+ - gnutls-bin
- gzip
- heimdal-multidev
- hostname
diff --git a/bootstrap/generated-dists/fedora38/Dockerfile
b/bootstrap/generated-dists/fedora38/Dockerfile
index 10002774e20..56426229c2b 100644
--- a/bootstrap/generated-dists/fedora38/Dockerfile
+++ b/bootstrap/generated-dists/fedora38/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
USER samba
WORKDIR /home/samba
# samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file
diff --git a/bootstrap/generated-dists/fedora38/bootstrap.sh
b/bootstrap/generated-dists/fedora38/bootstrap.sh
index 1e76edbb982..2b43dfc4e04 100755
--- a/bootstrap/generated-dists/fedora38/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora38/bootstrap.sh
@@ -39,6 +39,7 @@ dnf install -y \
glusterfs-api-devel \
glusterfs-devel \
gnutls-devel \
+ gnutls-utils \
gpgme-devel \
gzip \
hostname \
diff --git a/bootstrap/generated-dists/fedora38/packages.yml
b/bootstrap/generated-dists/fedora38/packages.yml
index 3b4d6fb3628..c5f9bc50574 100644
--- a/bootstrap/generated-dists/fedora38/packages.yml
+++ b/bootstrap/generated-dists/fedora38/packages.yml
@@ -28,6 +28,7 @@ packages:
- glusterfs-api-devel
- glusterfs-devel
- gnutls-devel
+ - gnutls-utils
- gpgme-devel
- gzip
- hostname
diff --git a/bootstrap/generated-dists/opensuse154/Dockerfile
b/bootstrap/generated-dists/opensuse154/Dockerfile
index a6bdd6cb328..621a3656389 100644
--- a/bootstrap/generated-dists/opensuse154/Dockerfile
+++ b/bootstrap/generated-dists/opensuse154/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
USER samba
WORKDIR /home/samba
# samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file
diff --git a/bootstrap/generated-dists/opensuse154/bootstrap.sh
b/bootstrap/generated-dists/opensuse154/bootstrap.sh
index 721f7a67a76..b82d1b61577 100755
--- a/bootstrap/generated-dists/opensuse154/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse154/bootstrap.sh
@@ -36,6 +36,7 @@ zypper --non-interactive install \
glib2-devel \
glibc-locale \
glusterfs-devel \
+ gnutls \
gnutls-devel \
gpgme-devel \
gzip \
diff --git a/bootstrap/generated-dists/opensuse154/packages.yml
b/bootstrap/generated-dists/opensuse154/packages.yml
index 18921cf0751..93de86726a4 100644
--- a/bootstrap/generated-dists/opensuse154/packages.yml
+++ b/bootstrap/generated-dists/opensuse154/packages.yml
@@ -24,6 +24,7 @@ packages:
- glib2-devel
- glibc-locale
- glusterfs-devel
+ - gnutls
- gnutls-devel
- gpgme-devel
- gzip
diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/Dockerfile
b/bootstrap/generated-dists/ubuntu1804-32bit/Dockerfile
index 3d0c21c1434..4feffbd3d8f 100644
--- a/bootstrap/generated-dists/ubuntu1804-32bit/Dockerfile
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
USER samba
WORKDIR /home/samba
# samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file
diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
index 702f5153382..78de9565b88 100755
--- a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
@@ -31,6 +31,7 @@ apt-get -y install \
gdb \
git \
glusterfs-common \
+ gnutls-bin \
gzip \
heimdal-multidev \
hostname \
diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
index 78a73aec01f..bef96d0280f 100644
--- a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
@@ -20,6 +20,7 @@ packages:
- gdb
- git
- glusterfs-common
+ - gnutls-bin
- gzip
- heimdal-multidev
- hostname
diff --git a/bootstrap/generated-dists/ubuntu1804/Dockerfile
b/bootstrap/generated-dists/ubuntu1804/Dockerfile
index 9ab534d7b9d..f389e0bb817 100644
--- a/bootstrap/generated-dists/ubuntu1804/Dockerfile
+++ b/bootstrap/generated-dists/ubuntu1804/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
USER samba
WORKDIR /home/samba
# samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 702f5153382..78de9565b88 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -31,6 +31,7 @@ apt-get -y install \
gdb \
git \
glusterfs-common \
+ gnutls-bin \
gzip \
heimdal-multidev \
hostname \
diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml
b/bootstrap/generated-dists/ubuntu1804/packages.yml
index 78a73aec01f..bef96d0280f 100644
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -20,6 +20,7 @@ packages:
- gdb
- git
- glusterfs-common
+ - gnutls-bin
- gzip
- heimdal-multidev
- hostname
diff --git a/bootstrap/generated-dists/ubuntu2004/Dockerfile
b/bootstrap/generated-dists/ubuntu2004/Dockerfile
index 4393c90f46e..b77adb77460 100644
--- a/bootstrap/generated-dists/ubuntu2004/Dockerfile
+++ b/bootstrap/generated-dists/ubuntu2004/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
USER samba
WORKDIR /home/samba
# samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file
diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index 702f5153382..78de9565b88 100755
--- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -31,6 +31,7 @@ apt-get -y install \
gdb \
git \
glusterfs-common \
+ gnutls-bin \
gzip \
heimdal-multidev \
hostname \
diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml
b/bootstrap/generated-dists/ubuntu2004/packages.yml
index 78a73aec01f..bef96d0280f 100644
--- a/bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2004/packages.yml
@@ -20,6 +20,7 @@ packages:
- gdb
- git
- glusterfs-common
+ - gnutls-bin
- gzip
- heimdal-multidev
- hostname
diff --git a/bootstrap/generated-dists/ubuntu2204/Dockerfile
b/bootstrap/generated-dists/ubuntu2204/Dockerfile
index 0b332649787..0b73aaceff5 100644
--- a/bootstrap/generated-dists/ubuntu2204/Dockerfile
+++ b/bootstrap/generated-dists/ubuntu2204/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
USER samba
WORKDIR /home/samba
# samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file
diff --git a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
index 83012cda983..5375052a438 100755
--- a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
@@ -31,6 +31,7 @@ apt-get -y install \
gdb \
git \
glusterfs-common \
+ gnutls-bin \
gzip \
heimdal-multidev \
hostname \
diff --git a/bootstrap/generated-dists/ubuntu2204/packages.yml
b/bootstrap/generated-dists/ubuntu2204/packages.yml
index 7d9f66e7f1f..eee8d9cdfd4 100644
--- a/bootstrap/generated-dists/ubuntu2204/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2204/packages.yml
@@ -20,6 +20,7 @@ packages:
- gdb
- git
- glusterfs-common
+ - gnutls-bin
- gzip
- heimdal-multidev
- hostname
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 77937ea6800..d5aa7938016 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-6f4e1c3f1eb3b3236ae793c11def2135386a0ee9
+cf0a5476a4f13d449a7542d01d225dc2aef2a333
diff --git a/python/samba/gp/gpclass.py b/python/samba/gp/gpclass.py
index 6083a0f8029..11275f3f117 100644
--- a/python/samba/gp/gpclass.py
+++ b/python/samba/gp/gpclass.py
@@ -982,7 +982,7 @@ def apply_gp(lp, creds, store, gp_extensions, username,
target, force=False):
if target == 'Computer':
ext.process_group_policy(del_gpos, changed_gpos)
else:
- drop_privileges(creds.get_principal(),
ext.process_group_policy,
+ drop_privileges(username, ext.process_group_policy,
del_gpos, changed_gpos)
except Exception as e:
log.error('Failed to apply extension %s' % str(ext))
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 99ec813af7c..c5041c93497 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -285,6 +285,7 @@ $ENV{SAMBA_DEPRECATED_SUPPRESS} = 1;
# see also bootstrap/config.py
$ENV{TZ} = "UTC";
$ENV{LC_ALL} = $ENV{LANG} = "en_US.utf8";
+$ENV{LANGUAGE} = "en_US";
my $bindir_abs = abs_path($bindir);
diff --git a/third_party/heimdal/.github/workflows/coverity.yml
b/third_party/heimdal/.github/workflows/coverity.yml
index dfea060d04b..78ec7e5a56b 100644
--- a/third_party/heimdal/.github/workflows/coverity.yml
+++ b/third_party/heimdal/.github/workflows/coverity.yml
@@ -16,7 +16,7 @@ jobs:
name: [linux-clang]
include:
- name: linux-clang
- os: ubuntu-18.04
+ os: ubuntu-22.04
compiler: clang
steps:
- name: Clone repository
@@ -25,7 +25,7 @@ jobs:
if: startsWith(matrix.os, 'ubuntu')
run: |
sudo apt-get update -qq
- sudo apt-get install -y bison comerr-dev flex libcap-ng-dev
libdb-dev libedit-dev libjson-perl libldap2-dev libncurses5-dev
libperl4-corelibs-perl libsqlite3-dev libkeyutils-dev pkg-config python ss-dev
texinfo unzip netbase keyutils ldap-utils gdb apport curl libmicrohttpd-dev
clang-tools clang-format jq valgrind
+ sudo apt-get install -y bison comerr-dev flex libcap-ng-dev
libdb-dev libedit-dev libjson-perl libldap2-dev libncurses5-dev
libperl4-corelibs-perl libsqlite3-dev libkeyutils-dev pkg-config python3 ss-dev
texinfo unzip netbase keyutils ldap-utils gdb apport curl libmicrohttpd-dev
clang-tools clang-format jq valgrind
# Temporary workaround for:
# https://github.com/actions/virtual-environments/issues/3185
sudo hostname localhost
diff --git a/third_party/heimdal/.github/workflows/linux-mit-interop.yml
b/third_party/heimdal/.github/workflows/linux-mit-interop.yml
index 72648ee2ce0..d1837a01d8c 100644
--- a/third_party/heimdal/.github/workflows/linux-mit-interop.yml
+++ b/third_party/heimdal/.github/workflows/linux-mit-interop.yml
@@ -14,7 +14,7 @@ jobs:
name: [linux-clang]
include:
- name: linux-clang
- os: ubuntu-18.04
+ os: ubuntu-22.04
compiler: clang
cflags: ''
steps:
@@ -31,7 +31,7 @@ jobs:
sudo apt-get install -y bison comerr-dev flex doxygen
sudo apt-get install -y libcap-ng-dev libdb-dev libedit-dev
libjson-perl
sudo apt-get install -y libldap2-dev libncurses5-dev
libperl4-corelibs-perl
- sudo apt-get install -y libsqlite3-dev libkeyutils-dev
pkg-config python
+ sudo apt-get install -y libsqlite3-dev libkeyutils-dev
pkg-config python3
sudo apt-get install -y ss-dev texinfo unzip netbase keyutils
ldap-utils
sudo apt-get install -y gdb apport curl libmicrohttpd-dev jq
valgrind
- name: Install MIT Kerberos dependencies
diff --git a/third_party/heimdal/.github/workflows/linux.yml
b/third_party/heimdal/.github/workflows/linux.yml
index 48e4c80dc3c..1bbfbb4ec24 100644
--- a/third_party/heimdal/.github/workflows/linux.yml
+++ b/third_party/heimdal/.github/workflows/linux.yml
@@ -57,11 +57,11 @@ jobs:
name: [linux-clang, linux-gcc]
include:
- name: linux-clang
- os: ubuntu-18.04
+ os: ubuntu-22.04
compiler: clang
cflags: ''
- name: linux-gcc
- os: ubuntu-18.04
+ os: ubuntu-22.04
compiler: gcc
cflags: '-Wnonnull'
steps:
@@ -74,7 +74,7 @@ jobs:
sudo apt-get install -y bison comerr-dev flex doxygen
sudo apt-get install -y libcap-ng-dev libdb-dev libedit-dev
libjson-perl
sudo apt-get install -y libldap2-dev libncurses5-dev
libperl4-corelibs-perl
- sudo apt-get install -y libsqlite3-dev libkeyutils-dev
pkg-config python
+ sudo apt-get install -y libsqlite3-dev libkeyutils-dev
pkg-config python3
sudo apt-get install -y ss-dev texinfo unzip netbase keyutils
ldap-utils
sudo apt-get install -y gdb apport curl libmicrohttpd-dev jq
valgrind
# Temporary workaround for:
diff --git a/third_party/heimdal/.github/workflows/osx.yml
b/third_party/heimdal/.github/workflows/osx.yml
index 3463e99b6e9..29aa05fc1f7 100644
--- a/third_party/heimdal/.github/workflows/osx.yml
+++ b/third_party/heimdal/.github/workflows/osx.yml
@@ -64,7 +64,7 @@ jobs:
- name: Install packages
run: |
echo "bison, flex, ncurses, texinfo, and unzip are in the base
OS."
- echo "berkeley-db, perl, python, curl, and jq are installed in
the"
+ echo "berkeley-db, perl, python3, curl, and jq are installed
in the"
echo "base image already."
brew install autoconf automake libtool cpanm texinfo texi2html
sudo cpanm install JSON
diff --git a/third_party/heimdal/.github/workflows/scanbuild.yml
b/third_party/heimdal/.github/workflows/scanbuild.yml
index 678ccfd8046..472b0b7e396 100644
--- a/third_party/heimdal/.github/workflows/scanbuild.yml
+++ b/third_party/heimdal/.github/workflows/scanbuild.yml
@@ -20,7 +20,7 @@ jobs:
name: [linux-clang]
include:
- name: linux-clang
- os: ubuntu-18.04
+ os: ubuntu-22.04
--
Samba Shared Repository
