[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 027332cee56 s3:winbindd: Call winbind_add_failed_connection_entry()
for the correct dc name
via 928ce91eb7b s3:winbindd: Skip check_negative_conn_cache() if
saf_servername == NULL
from 10a4a977baf gitlab-ci: run samba-codecheck on ubuntu22.04
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 027332cee56472aae4b349ede554fc8a76e6e2c4
Author: Pavel Filipenský
Date: Mon Sep 18 11:16:39 2023 +0200
s3:winbindd: Call winbind_add_failed_connection_entry() for the correct dc
name
We were calling winbind_add_failed_connection_entry() for saf_servername
which is NULL. domain->dcname should be used instead.
Signed-off-by: Pavel Filipenský
Reviewed-by: Ralph Boehme
Autobuild-User(master): Pavel Filipensky
Autobuild-Date(master): Wed Oct 11 16:42:15 UTC 2023 on atb-devel-224
commit 928ce91eb7baf96fff1c35f60d02600302f69566
Author: Pavel Filipenský
Date: Mon Sep 18 11:15:21 2023 +0200
s3:winbindd: Skip check_negative_conn_cache() if saf_servername == NULL
saf_servername can be NULL even after calling saf_fetch(). Avoid
calling check_negative_conn_cache() like it was before commit 0fcf0012
Signed-off-by: Pavel Filipenský
Reviewed-by: Ralph Boehme
---
Summary of changes:
source3/winbindd/winbindd_cm.c | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 13ab6754fd3..014392fdb5d 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1426,9 +1426,12 @@ static bool connect_preferred_dc(TALLOC_CTX *mem_ctx,
* Check the negative connection cache before talking to it. It going
* down may have triggered the reconnection.
*/
- status = check_negative_conn_cache(domain->name, saf_servername);
- if (!NT_STATUS_IS_OK(status)) {
- saf_servername = NULL;
+ if (saf_servername != NULL) {
+ status = check_negative_conn_cache(domain->name,
+ saf_servername);
+ if (!NT_STATUS_IS_OK(status)) {
+ saf_servername = NULL;
+ }
}
if (saf_servername != NULL) {
@@ -1477,7 +1480,10 @@ static bool connect_preferred_dc(TALLOC_CTX *mem_ctx,
NULL, -1, NULL, -1,
fd, NULL, 10);
if (!NT_STATUS_IS_OK(status)) {
- goto fail;
+ winbind_add_failed_connection_entry(domain,
+ domain->dcname,
+ NT_STATUS_UNSUCCESSFUL);
+ return false;
}
return true;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 10a4a977baf gitlab-ci: run samba-codecheck on ubuntu22.04
via 9a3c558aa44 bootstrap: install codespell, shfmt and shellcheck also
on debian/ubuntu
via d60af10e6af .codespellignore: adjust in order to pass on ubuntu
22.04
via 94462dfabf0 s4:torture/smb2: fix typo in acls.c
from 6071220fcb1 libcli: Make debug_unix_user_token() use just one DEBUG
statement
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 10a4a977bafaf2ca9578d0aeae9760bf5b65b5ff
Author: Stefan Metzmacher
Date: Wed Oct 11 10:15:42 2023 +
gitlab-ci: run samba-codecheck on ubuntu22.04
There's no reason to run it on fedora38
and it makes sure autobuild and gitlab-ci use the same.
Signed-off-by: Stefan Metzmacher
Reviewed-by: Ralph Boehme
Autobuild-User(master): Stefan Metzmacher
Autobuild-Date(master): Wed Oct 11 12:52:57 UTC 2023 on atb-devel-224
commit 9a3c558aa442aef10d8edcfe811cc23afb9b2b4c
Author: Stefan Metzmacher
Date: Wed Oct 11 10:15:42 2023 +
bootstrap: install codespell, shfmt and shellcheck also on debian/ubuntu
Signed-off-by: Stefan Metzmacher
Reviewed-by: Ralph Boehme
commit d60af10e6af97d0a4a69b3282dbfeeb001e669c9
Author: Stefan Metzmacher
Date: Wed Oct 11 09:47:09 2023 +
.codespellignore: adjust in order to pass on ubuntu 22.04
Signed-off-by: Stefan Metzmacher
Reviewed-by: Ralph Boehme
commit 94462dfabf0c14586c00a8161f125b2bd4d18ee1
Author: Ralph Boehme
Date: Wed Oct 11 11:17:07 2023 +0200
s4:torture/smb2: fix typo in acls.c
This fixes the failing samba-codecheck CI job and is not part of the
functional
security fix.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15439
Signed-off-by: Ralph Boehme
Reviewed-by: Stefan Metzmacher
---
Summary of changes:
.codespellignore| 6 ++
.gitlab-ci-main.yml | 4 +---
bootstrap/config.py | 11 ---
bootstrap/generated-dists/debian11-32bit/bootstrap.sh | 2 ++
bootstrap/generated-dists/debian11-32bit/packages.yml | 2 ++
bootstrap/generated-dists/debian11/bootstrap.sh | 2 ++
bootstrap/generated-dists/debian11/packages.yml | 2 ++
bootstrap/generated-dists/debian12-32bit/bootstrap.sh | 3 +++
bootstrap/generated-dists/debian12-32bit/packages.yml | 3 +++
bootstrap/generated-dists/debian12/bootstrap.sh | 3 +++
bootstrap/generated-dists/debian12/packages.yml | 3 +++
bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh | 2 ++
bootstrap/generated-dists/ubuntu1804-32bit/packages.yml | 2 ++
bootstrap/generated-dists/ubuntu1804/bootstrap.sh | 2 ++
bootstrap/generated-dists/ubuntu1804/packages.yml | 2 ++
bootstrap/generated-dists/ubuntu2004/bootstrap.sh | 2 ++
bootstrap/generated-dists/ubuntu2004/packages.yml | 2 ++
bootstrap/generated-dists/ubuntu2204/bootstrap.sh | 3 +++
bootstrap/generated-dists/ubuntu2204/packages.yml | 3 +++
bootstrap/sha1sum.txt | 2 +-
source4/torture/smb2/acls.c | 2 +-
21 files changed, 55 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.codespellignore b/.codespellignore
index ee56c0af3ec..c2f4c37feab 100644
--- a/.codespellignore
+++ b/.codespellignore
@@ -1,11 +1,15 @@
aas
afile
ags
+alloced
ans
+ba
blong
browseable
+bre
bu
clen
+creat
daa
ect
fo
@@ -16,6 +20,7 @@ inout
ist
keypair
mis
+msdos
nd
ois
ommit
@@ -43,6 +48,7 @@ ue
unsecure
unx
uptodateness
+wan
ypes
som
vas
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 9c1ddc69fd5..6614ef74e64 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: 21a93787675107f010836bbfa5e8542c272bc4b0
+ SAMBA_CI_CONTAINER_TAG: 07a822597b5bce4af9e8e2987856b27eb20bd1b7
#
# We use the ubuntu2204 image as default as
# it matches what we have on atb-devel-224
@@ -391,8 +391,6 @@ samba-fips:
samba-codecheck:
extends: .shared_template
needs:
- variables:
-SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_fedora38}
stage: build_first
.private_test_only:
diff --git a/bootstrap/config.py b/bootstrap/config.py
index d531dfc0e63..cfee5e049ce 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -42,6 +42,7 @@ COMMON = [
'ccache',
'curl',
'chrpath',
+'codespell',
'flex',
'gcc',
'gdb',
@@ -58,6 +59,7 @@ COMMON = [
'rng-tools',
'rsync',
'sed',
+
[SCM] Samba Shared Repository - branch v4-18-test updated
The branch, v4-18-test has been updated via 653984f4a6d ctdb-daemon: Call setproctitle_init() from b9b0d8bc0f0 VERSION: Bump version up to Samba 4.18.9... https://git.samba.org/?p=samba.git;a=shortlog;h=v4-18-test - Log - commit 653984f4a6d3af16597ccb70f23d09e6ed87d1f9 Author: Martin Schwenke Date: Tue Sep 19 17:47:36 2023 +1000 ctdb-daemon: Call setproctitle_init() Commit 19c82c19c009eefe975ae95c8b709fc93f5f4c39 changed the behaviour of prctl_set_comment() so it now calls setproctitle(3bsd) by default. In some Linux distributions (e.g. Rocky Linux 8.8), this results in messages like this spamming the logs: ctdbd: setproctitle not initialized, please either call setproctitle_init() or link against libbsd-ctor. Most Samba daemons seem to call setproctitle_init(), so do it here. In the longer term CTDB should also switch to using lib/util's process_set_title(), like the rest of Samba, for more flexible process names. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15479 Signed-off-by: Martin Schwenke Reviewed-by: Ralph Boehme Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Thu Sep 21 00:46:50 UTC 2023 on atb-devel-224 (cherry picked from commit 8b9f464420b66cebaf00654cf8b19165b301b8b6) Autobuild-User(v4-18-test): Jule Anger Autobuild-Date(v4-18-test): Wed Oct 11 10:57:21 UTC 2023 on atb-devel-224 --- Summary of changes: ctdb/server/ctdbd.c | 2 ++ 1 file changed, 2 insertions(+) Changeset truncated at 500 lines: diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index 10541cb21f1..a388bff1598 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -170,6 +170,8 @@ int main(int argc, const char *argv[]) const char *test_mode; bool ok; + setproctitle_init(argc, discard_const(argv), environ); + /* * Basic setup */ -- Samba Shared Repository
