[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c901adaa0d4 bootstrap: Add Debian 11
from 9d3a6919202 tests/krb5: Add tests for requesting a service ticket
without a PAC
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c901adaa0d4526deff550806e49976d686122674
Author: Martin Schwenke
Date: Thu Oct 14 14:50:41 2021 +1100
bootstrap: Add Debian 11
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14872
Signed-off-by: Martin Schwenke
Reviewed-by: Andrew Bartlett
Autobuild-User(master): Andrew Bartlett
Autobuild-Date(master): Mon Oct 18 17:19:17 UTC 2021 on sn-devel-184
---
Summary of changes:
.gitlab-ci-main.yml | 8 +++-
bootstrap/.gitlab-ci.yml | 3 +++
bootstrap/config.py | 8
bootstrap/generated-dists/Vagrantfile | 7 +++
bootstrap/generated-dists/{centos7 => debian11}/Dockerfile| 2 +-
bootstrap/generated-dists/{debian10 => debian11}/bootstrap.sh | 0
bootstrap/generated-dists/{centos7 => debian11}/locale.sh | 0
bootstrap/generated-dists/{debian10 => debian11}/packages.yml | 0
bootstrap/sha1sum.txt | 2 +-
9 files changed, 27 insertions(+), 3 deletions(-)
copy bootstrap/generated-dists/{centos7 => debian11}/Dockerfile (92%)
copy bootstrap/generated-dists/{debian10 => debian11}/bootstrap.sh (100%)
copy bootstrap/generated-dists/{centos7 => debian11}/locale.sh (100%)
copy bootstrap/generated-dists/{debian10 => debian11}/packages.yml (100%)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index f807eef41ce..ba8de6c22fe 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -42,7 +42,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
- SAMBA_CI_CONTAINER_TAG: 752c448d3186fe93a0c4039b8fbe897bb67a1f33
+ SAMBA_CI_CONTAINER_TAG: 8d90789fe49d9003a7e5c66b1a00639bcce1238f
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@@ -58,6 +58,7 @@ variables:
SAMBA_CI_CONTAINER_IMAGE_ubuntu2004: ubuntu2004
SAMBA_CI_CONTAINER_IMAGE_debian9: debian9
SAMBA_CI_CONTAINER_IMAGE_debian10: debian10
+ SAMBA_CI_CONTAINER_IMAGE_debian11: debian11
SAMBA_CI_CONTAINER_IMAGE_opensuse151: opensuse151
SAMBA_CI_CONTAINER_IMAGE_opensuse152: opensuse152
SAMBA_CI_CONTAINER_IMAGE_fedora33: fedora33
@@ -569,6 +570,11 @@ debian10-samba-o3:
variables:
SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_debian10}
+debian11-samba-o3:
+ extends: .samba-o3-template
+ variables:
+SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_debian11}
+
opensuse151-samba-o3:
extends: .samba-o3-template
variables:
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 1cef89374de..01da6106b53 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -97,6 +97,9 @@ ubuntu2004:
debian10:
extends: .build_image_template
+debian11:
+ extends: .build_image_template
+
fedora33:
extends: .build_image_template
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 7fe3bbd956a..c98ece513ec 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -399,6 +399,14 @@ DEB_DISTS = {
'liburing-dev': '', # not available
}
},
+'debian11': {
+'docker_image': 'debian:11',
+'vagrant_box': 'debian/bullseye64',
+'replace': {
+'language-pack-en': '', # included in locales
+'liburing-dev': '', # not available
+}
+},
'ubuntu1804': {
'docker_image': 'ubuntu:18.04',
'vagrant_box': 'ubuntu/bionic64',
diff --git a/bootstrap/generated-dists/Vagrantfile
b/bootstrap/generated-dists/Vagrantfile
index 7c1e0d80c6a..358d8e23d59 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -31,6 +31,13 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "debian10/locale.sh"
end
+config.vm.define "debian11" do |v|
+v.vm.box = "debian/bullseye64"
+v.vm.hostname = "debian11"
+v.vm.provision :shell, path: "debian11/bootstrap.sh"
+v.vm.provision :shell, path: "debian11/locale.sh"
+end
+
config.vm.define "fedora33" do |v|
v.vm.box = "fedora/33-cloud-base"
v.vm.hostname = "fedora33"
diff --git a/bootstrap/generated-dists/centos7/Dockerfile
b/bootstrap/generated-dists/debian11/Dockerfile
similarity index 92%
copy from bootstrap/generated-dists/centos7/Dockerfile
copy to bootstrap/generated-dists/debian11/Dockerfile
index 2f171ad1c62..6a16324f201 100644
---
[SCM] Samba Shared Repository - branch v4-15-test updated
The branch, v4-15-test has been updated via 57ffd32d455 s3: smbspool. Remove last use of 'extern char **environ;'. via d3b3aa9e19f Fix detection of rpc/xdr.h on macOS via 0d59b1fb326 vfs_preopen.c: Fix -Wformat error on macOS via 3ded98767d3 source3/smbd/statcache.c: Fix -Wformat build error on macOS via 4c89d9169a4 sec_ctx.c: Fix -Wunused-function warning on macOS via 0daa3af7042 source3/printing/queue_process.c: fix build on macOS via 80e9d89a97b audit_logging.c: fix compilation on macOS via 448f2acdcea charset_macosxfs.c: fix compilation on macOS via d3df31162f0 ctdb-tests: add a comment to the generated public_addresses file used by eventscript UNIT tests via 63a3b7838e1 ctdb-tests: Fix typo in ctdb stub comment matching via 36621069e26 ctdb-scripts: filter out comments in public_addresses file via dffca59ded1 s3: VFS: zfsacl: Ensure we use a pathref fd, not an io fd, for getting/setting ZFS ACLs. via f2455a9023c s3: smbd: Ensure when we change security context we delete any $cwd cache. via a55d4fe2208 s3: selftest: Add regression test to show the $cwd cache is misbehaving when we connect as a different user on a share. from 86738410826 .gitlab-ci: Allow a 1 hour to build Samba https://git.samba.org/?p=samba.git;a=shortlog;h=v4-15-test - Log - commit 57ffd32d455a4cf573eb886a6bde5ac57741c046 Author: Jeremy Allison Date: Wed Oct 13 09:46:07 2021 -0700 s3: smbspool. Remove last use of 'extern char **environ;'. This should come from lib/replace/replace.h to cope with system (MacOSX etc.) differences. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14862 Signed-off-by: Jeremy Allison Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Thu Oct 14 19:51:59 UTC 2021 on sn-devel-184 (cherry picked from commit 1d3e118f6f2274a67cdb8141dc8dade0c571c8f5) Autobuild-User(v4-15-test): Jule Anger Autobuild-Date(v4-15-test): Mon Oct 18 09:07:06 UTC 2021 on sn-devel-184 commit d3b3aa9e19f3b9b3231d75ae56debce36e84d593 Author: Alex Richardson Date: Wed Sep 8 14:42:57 2021 +0100 Fix detection of rpc/xdr.h on macOS We need to include rpc/types.h first to include this header. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14862 Signed-off-by: Alex Richardson Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Wed Oct 13 02:33:05 UTC 2021 on sn-devel-184 (cherry picked from commit fc2347be4ed9a9083a56468ca5e43070059038c5) commit 0d59b1fb326196c1dd58aeaf69c9f2f89311f761 Author: Alex Richardson Date: Wed Sep 8 14:42:25 2021 +0100 vfs_preopen.c: Fix -Wformat error on macOS BUG: https://bugzilla.samba.org/show_bug.cgi?id=14862 Signed-off-by: Alex Richardson Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison (cherry picked from commit 99ee7f3d89cce9b07b8ed3f55f7e8e67baed6ee1) commit 3ded98767d34938c12f2b5d723a41d09391f48ae Author: Alex Richardson Date: Wed Sep 8 13:29:54 2021 +0100 source3/smbd/statcache.c: Fix -Wformat build error on macOS The format string uses PRIx64, so we should be using uint64_t and not uintmax_t. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14862 Signed-off-by: Alex Richardson Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison (cherry picked from commit 1d893f723207040c285ed061db3a690099f8c929) commit 4c89d9169a4173997820e6ad1603bdb30ebfd808 Author: Alex Richardson Date: Wed Sep 8 13:27:41 2021 +0100 sec_ctx.c: Fix -Wunused-function warning on macOS BUG: https://bugzilla.samba.org/show_bug.cgi?id=14862 Signed-off-by: Alex Richardson Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison (cherry picked from commit 6dadf251fc02c2b3237c48d316f5cb8791ab4f76) commit 0daa3af704218656414d1d941425881345bb1b70 Author: Alex Richardson Date: Wed Sep 8 13:25:04 2021 +0100 source3/printing/queue_process.c: fix build on macOS On macOS environ is defined to (*_NSGetEnviron()) in lib/replace/replace.h and otherwise the `extern char **environ` can be found there. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14862 Signed-off-by: Alex Richardson Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison (cherry picked from commit e4eb1f151011d2bd6a2d39b156663ddd9126d345) commit 80e9d89a97baa42f261e75c4f33db84aa79d17bb Author: Alex Richardson Date: Wed Sep 8 12:57:03 2021 +0100 audit_logging.c: fix compilation on macOS On macOS tv_usec is an int so failus the build with -Werror,-Wformat. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14862
[SCM] Samba Shared Repository - branch v4-14-test updated
The branch, v4-14-test has been updated
via 44636fa0378 ctdb-tests: add a comment to the generated
public_addresses file used by eventscript UNIT tests
via c10d2880356 ctdb-tests: Fix typo in ctdb stub comment matching
via a200f88452e ctdb-scripts: filter out comments in public_addresses
file
via edf50886ec5 s3: smbd: Ensure when we change security context we
delete any $cwd cache.
via de2150dc762 s3: selftest: Add regression test to show the $cwd
cache is misbehaving when we connect as a different user on a share.
from 6f10103d076 VERSION: Bump version up to Samba 4.14.9...
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-14-test
- Log -
commit 44636fa037814fe71d2397865ff3cfa88f8fd35c
Author: Ralph Boehme
Date: Fri Oct 8 05:58:37 2021 +0200
ctdb-tests: add a comment to the generated public_addresses file used by
eventscript UNIT tests
test stub code has been updated to handle this, so now let's put it
to work.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14826
RN: Correctly ignore comments in CTDB public addresses file
Signed-off-by: Ralph Boehme
Reviewed-by: Martin Schwenke
(cherry picked from commit 4e3676cb3c4d24cd4c287703d2cd812a2a8c36ff)
Autobuild-User(v4-14-test): Jule Anger
Autobuild-Date(v4-14-test): Mon Oct 18 08:41:16 UTC 2021 on sn-devel-184
commit c10d2880356ded48bc7aac1e4540acdc092d34dc
Author: Martin Schwenke
Date: Tue Oct 12 12:19:27 2021 +1100
ctdb-tests: Fix typo in ctdb stub comment matching
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14826
Signed-off-by: Martin Schwenke
Reviewed-by: Ralph Boehme
(cherry picked from commit 5426c104f5090751c1ea02f0c0667d8d071a4a83)
commit a200f88452e6daac6ece9738ab3192470224aac9
Author: Ralph Boehme
Date: Wed Sep 8 16:53:12 2021 +0200
ctdb-scripts: filter out comments in public_addresses file
Note that order of sed expressions matters: the expression to delete
comment lines must come first as the second expression would transform
# comment
to
comment
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14826
Signed-off-by: Ralph Boehme
Reviewed-by: Martin Schwenke
(cherry picked from commit 530e8d4b9e47601b88e20bcaefa2d502efcebe60)
commit edf50886ec524a58a8862c04347bbb29a8a29376
Author: Jeremy Allison
Date: Thu Oct 7 14:11:25 2021 -0700
s3: smbd: Ensure when we change security context we delete any $cwd cache.
This will ensure we *always* call into the VFS_SMB_CHDIR backends
on security context switch. The $cwd was an optimization that
was only looking at the raw filesystem path. We could delete it
completely but that is a patch for another day.
Remove knownfail on regression test.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14682
RN: vfs_shadow_copy2: core dump in make_relative_path
Signed-off-by: Jeremy Allison
Reviewed-by: Ralph Boehme
Autobuild-User(master): Ralph Böhme
Autobuild-Date(master): Fri Oct 8 21:28:04 UTC 2021 on sn-devel-184
(cherry picked from commit 4fe965836243928ac33eb95a67d3e889fdc15861)
commit de2150dc762bb911e320cd352ab5a41a0f92bc72
Author: Jeremy Allison
Date: Thu Oct 7 14:08:48 2021 -0700
s3: selftest: Add regression test to show the $cwd cache is misbehaving
when we connect as a different user on a share.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14682
Signed-off-by: Jeremy Allison
Reviewed-by: Ralph Boehme
(cherry picked from commit 954e637ddc6f0f5291d0a15cdbcbc6a4f7a6cb13)
---
Summary of changes:
ctdb/config/events/legacy/10.interface.script | 3 +-
ctdb/config/functions | 3 +
ctdb/tests/UNIT/eventscripts/scripts/local.sh | 1 +
ctdb/tests/UNIT/eventscripts/stubs/ctdb | 2 +-
source3/script/tests/test_chdir_cache.sh | 102 ++
source3/selftest/tests.py | 9 +++
source3/smbd/sec_ctx.c| 8 ++
7 files changed, 126 insertions(+), 2 deletions(-)
create mode 100755 source3/script/tests/test_chdir_cache.sh
Changeset truncated at 500 lines:
diff --git a/ctdb/config/events/legacy/10.interface.script
b/ctdb/config/events/legacy/10.interface.script
index 72e0c101d47..d87f6c52c58 100755
--- a/ctdb/config/events/legacy/10.interface.script
+++ b/ctdb/config/events/legacy/10.interface.script
@@ -25,7 +25,8 @@ fi
get_all_interfaces ()
{
# Get all the interfaces listed in the public_addresses file
-all_interfaces=$(sed -e 's/^[^\t ]*[\t ]*//' \
+all_interfaces=$(sed -e '/^#.*/d' \
+-e 's/^[^\t ]*[\t ]*//' \
-e 's/,/ /g' \
-e
