The branch, master has been updated
via f06525afff3 bootstrap: remove wintest-only dependency
via deb80a60f38 bootstrap: python-cryptography is not just for tests
via 6c3bdb07472 smbd: avoid work in unix token debug no-op
via b25e63710eb libcli: avoid work in security token debug no-op
via 7e083a6b3a1 python:tdb_util: "samba-tool domain backup offline"
hangs
via 84919f47e17 s3:torture: report kilobytes per second as kB/s, not
kb/s
via 1f6cc7f98c3 smbclient: report kilobytes per second as kB/s, not kb/s
via 365f4cf30d0 build: --disable-warnings-as-errors avoids some warning
config checks
from 125862c617e vfs: Fix vfs_streams_depot's fstatat
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f06525afff376bc6081d49c7e97a768e5263199a
Author: Douglas Bagnall <[email protected]>
Date: Tue Feb 25 11:30:03 2025 +1300
bootstrap: remove wintest-only dependency
Nobody has run Wintest in the last 10 years, and we don't need it
in our CI tests.
Signed-off-by: Douglas Bagnall <[email protected]>
Reviewed-by: Jennifer Sutton <[email protected]>
Autobuild-User(master): Douglas Bagnall <[email protected]>
Autobuild-Date(master): Thu Feb 27 01:00:10 UTC 2025 on atb-devel-224
commit deb80a60f38a7bc560d432d7861113b3ca62e5bd
Author: Douglas Bagnall <[email protected]>
Date: Tue Feb 25 11:09:40 2025 +1300
bootstrap: python-cryptography is not just for tests
Relating to, but not fixing, these distro bugs:
https://bugs.launchpad.net/ubuntu/+source/samba/+bug/2099895
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1086768
Signed-off-by: Douglas Bagnall <[email protected]>
Reviewed-by: Jennifer Sutton <[email protected]>
commit 6c3bdb07472be7f499430834e7ed24b988185e96
Author: Douglas Bagnall <[email protected]>
Date: Fri Feb 21 10:51:33 2025 +1300
smbd: avoid work in unix token debug no-op
When the debug level is too low to print, we don't need to allocate
the strings.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=15737
Signed-off-by: Volker Lendecke <[email protected]>
Signed-off-by: Douglas Bagnall <[email protected]>
Reviewed-by: Jennifer Sutton <[email protected]>
Pair-programmed-with: Volker Lendecke <[email protected]>
commit b25e63710eb247a03cc2da99f44eace6cda2c50d
Author: Volker Lendecke <[email protected]>
Date: Mon Oct 14 13:29:21 2024 +0200
libcli: avoid work in security token debug no-op
When the debug level is too low to print, we don't need to allocate
the strings.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=15737
Signed-off-by: Volker Lendecke <[email protected]>
Signed-off-by: Douglas Bagnall <[email protected]>
Reviewed-by: Jennifer Sutton <[email protected]>
Pair-programmed-with: Douglas Bagnall <[email protected]>
commit 7e083a6b3a12933b79ef19ccbd4c13bfa0203498
Author: Andrea Venturoli <[email protected]>
Date: Wed Feb 19 08:51:16 2025 +0100
python:tdb_util: "samba-tool domain backup offline" hangs
GNU getopt(3) is by default non-POSIX compliant and accepts options after
positional arguments (unless forced with POSIXLY_CORRECT). This is not
portable,
e..g., on FreeBSD. Put options first and then positional arguments.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15804
Signed-off-by: Andrea Venturoli <[email protected]>
Reviewed-by: Douglas Bagnall <[email protected]>
Reviewed-by: Jennifer Sutton <[email protected]>
commit 84919f47e17ceecabd769a7b5279ed8ed32a1228
Author: Douglas Bagnall <[email protected]>
Date: Thu Feb 20 17:21:11 2025 +1300
s3:torture: report kilobytes per second as kB/s, not kb/s
https://bugzilla.samba.org/show_bug.cgi?id=11023
Signed-off-by: Douglas Bagnall <[email protected]>
Reviewed-by: Jennifer Sutton <[email protected]>
commit 1f6cc7f98c3675d4e15477bbac019271d4499ae7
Author: Douglas Bagnall <[email protected]>
Date: Thu Feb 20 17:20:16 2025 +1300
smbclient: report kilobytes per second as kB/s, not kb/s
https://bugzilla.samba.org/show_bug.cgi?id=11023
Signed-off-by: Douglas Bagnall <[email protected]>
Reviewed-by: Jennifer Sutton <[email protected]>
commit 365f4cf30d0932405d565cf3c606e1d75410fdb5
Author: Douglas Bagnall <[email protected]>
Date: Thu Oct 10 11:20:28 2024 +1300
build: --disable-warnings-as-errors avoids some warning config checks
This fixes compilation with some versions of Honggfuzz.
Signed-off-by: Douglas Bagnall <[email protected]>
Reviewed-by: Jennifer Sutton <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci-main.yml | 2 +-
bootstrap/config.py | 3 +--
bootstrap/generated-dists/debian11-32bit/bootstrap.sh | 1 -
bootstrap/generated-dists/debian11-32bit/packages.yml | 1 -
bootstrap/generated-dists/debian11/bootstrap.sh | 1 -
bootstrap/generated-dists/debian11/packages.yml | 1 -
bootstrap/generated-dists/debian12-32bit/bootstrap.sh | 1 -
bootstrap/generated-dists/debian12-32bit/packages.yml | 1 -
bootstrap/generated-dists/debian12/bootstrap.sh | 1 -
bootstrap/generated-dists/debian12/packages.yml | 1 -
bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh | 1 -
bootstrap/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 +-
buildtools/wafsamba/samba_autoconf.py | 5 +++--
libcli/security/security_token.c | 9 +++++++--
python/samba/tdb_util.py | 5 +++--
source3/auth/token_util.c | 8 +++++++-
source3/client/client.c | 4 ++--
source3/torture/torture.c | 2 +-
source4/client/client.c | 4 ++--
26 files changed, 28 insertions(+), 32 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 23be1ef6d7e..df3ec8ae984 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: fb63148d63beac20259d0c61ece2c608d2d1d2a1
+ SAMBA_CI_CONTAINER_TAG: d20548dec714e202867b593f5e19f3004f7a2457
#
# 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 d9e39b19045..ae94c75bfa0 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -144,14 +144,13 @@ PKGS = [
('', 'crypto-policies-scripts'),
('python3', 'python3'),
- ('python3-cryptography', 'python3-cryptography'), # for krb5 tests
+ ('python3-cryptography', 'python3-cryptography'),
('python3-dev', 'python3-devel'),
('python3-dbg', ''),
('python3-iso8601', 'python3-iso8601'),
('python3-gpg', 'python3-gpg'), # defaults to ubuntu/fedora latest
('python3-markdown', 'python3-markdown'),
('python3-dnspython', 'python3-dns'),
- ('python3-pexpect', ''), # for wintest only
('python3-pyasn1', 'python3-pyasn1'), # for krb5 tests
('python3-setproctitle', 'python3-setproctitle'),
('python3-requests', 'python3-requests'), # for cert auto enroll
diff --git a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
index 1781cd75b19..b7d5f87018b 100755
--- a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
@@ -97,7 +97,6 @@ apt-get -y install \
python3-gpg \
python3-iso8601 \
python3-markdown \
- python3-pexpect \
python3-pyasn1 \
python3-requests \
python3-setproctitle \
diff --git a/bootstrap/generated-dists/debian11-32bit/packages.yml
b/bootstrap/generated-dists/debian11-32bit/packages.yml
index 1484203648a..b39e3c31dae 100644
--- a/bootstrap/generated-dists/debian11-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian11-32bit/packages.yml
@@ -86,7 +86,6 @@ packages:
- python3-gpg
- python3-iso8601
- python3-markdown
- - python3-pexpect
- python3-pyasn1
- python3-requests
- python3-setproctitle
diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh
b/bootstrap/generated-dists/debian11/bootstrap.sh
index 1781cd75b19..b7d5f87018b 100755
--- a/bootstrap/generated-dists/debian11/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11/bootstrap.sh
@@ -97,7 +97,6 @@ apt-get -y install \
python3-gpg \
python3-iso8601 \
python3-markdown \
- python3-pexpect \
python3-pyasn1 \
python3-requests \
python3-setproctitle \
diff --git a/bootstrap/generated-dists/debian11/packages.yml
b/bootstrap/generated-dists/debian11/packages.yml
index 1484203648a..b39e3c31dae 100644
--- a/bootstrap/generated-dists/debian11/packages.yml
+++ b/bootstrap/generated-dists/debian11/packages.yml
@@ -86,7 +86,6 @@ packages:
- python3-gpg
- python3-iso8601
- python3-markdown
- - python3-pexpect
- python3-pyasn1
- python3-requests
- python3-setproctitle
diff --git a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
index 6367f8fa4a0..58d3866fdf2 100755
--- a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
@@ -96,7 +96,6 @@ apt-get -y install \
python3-gpg \
python3-iso8601 \
python3-markdown \
- python3-pexpect \
python3-pyasn1 \
python3-requests \
python3-setproctitle \
diff --git a/bootstrap/generated-dists/debian12-32bit/packages.yml
b/bootstrap/generated-dists/debian12-32bit/packages.yml
index 0c29da53999..c7756de7cbd 100644
--- a/bootstrap/generated-dists/debian12-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian12-32bit/packages.yml
@@ -85,7 +85,6 @@ packages:
- python3-gpg
- python3-iso8601
- python3-markdown
- - python3-pexpect
- python3-pyasn1
- python3-requests
- python3-setproctitle
diff --git a/bootstrap/generated-dists/debian12/bootstrap.sh
b/bootstrap/generated-dists/debian12/bootstrap.sh
index 6367f8fa4a0..58d3866fdf2 100755
--- a/bootstrap/generated-dists/debian12/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12/bootstrap.sh
@@ -96,7 +96,6 @@ apt-get -y install \
python3-gpg \
python3-iso8601 \
python3-markdown \
- python3-pexpect \
python3-pyasn1 \
python3-requests \
python3-setproctitle \
diff --git a/bootstrap/generated-dists/debian12/packages.yml
b/bootstrap/generated-dists/debian12/packages.yml
index 0c29da53999..c7756de7cbd 100644
--- a/bootstrap/generated-dists/debian12/packages.yml
+++ b/bootstrap/generated-dists/debian12/packages.yml
@@ -85,7 +85,6 @@ packages:
- python3-gpg
- python3-iso8601
- python3-markdown
- - python3-pexpect
- python3-pyasn1
- python3-requests
- python3-setproctitle
diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
index 2cb5e686209..53d82f3bb79 100755
--- a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
@@ -98,7 +98,6 @@ apt-get -y install \
python3-gpg \
python3-iso8601 \
python3-markdown \
- python3-pexpect \
python3-pyasn1 \
python3-requests \
python3-setproctitle \
diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
index 857ab0f6cfa..cfa24e50a79 100644
--- a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
@@ -87,7 +87,6 @@ packages:
- python3-gpg
- python3-iso8601
- python3-markdown
- - python3-pexpect
- python3-pyasn1
- python3-requests
- python3-setproctitle
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 2cb5e686209..53d82f3bb79 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -98,7 +98,6 @@ apt-get -y install \
python3-gpg \
python3-iso8601 \
python3-markdown \
- python3-pexpect \
python3-pyasn1 \
python3-requests \
python3-setproctitle \
diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml
b/bootstrap/generated-dists/ubuntu1804/packages.yml
index 857ab0f6cfa..cfa24e50a79 100644
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -87,7 +87,6 @@ packages:
- python3-gpg
- python3-iso8601
- python3-markdown
- - python3-pexpect
- python3-pyasn1
- python3-requests
- python3-setproctitle
diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index 2cb5e686209..53d82f3bb79 100755
--- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -98,7 +98,6 @@ apt-get -y install \
python3-gpg \
python3-iso8601 \
python3-markdown \
- python3-pexpect \
python3-pyasn1 \
python3-requests \
python3-setproctitle \
diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml
b/bootstrap/generated-dists/ubuntu2004/packages.yml
index 857ab0f6cfa..cfa24e50a79 100644
--- a/bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2004/packages.yml
@@ -87,7 +87,6 @@ packages:
- python3-gpg
- python3-iso8601
- python3-markdown
- - python3-pexpect
- python3-pyasn1
- python3-requests
- python3-setproctitle
diff --git a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
index b1039708194..0b9fd98c480 100755
--- a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
@@ -98,7 +98,6 @@ apt-get -y install \
python3-gpg \
python3-iso8601 \
python3-markdown \
- python3-pexpect \
python3-pyasn1 \
python3-requests \
python3-setproctitle \
diff --git a/bootstrap/generated-dists/ubuntu2204/packages.yml
b/bootstrap/generated-dists/ubuntu2204/packages.yml
index 8ab93b80b2d..23e416fc1aa 100644
--- a/bootstrap/generated-dists/ubuntu2204/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2204/packages.yml
@@ -87,7 +87,6 @@ packages:
- python3-gpg
- python3-iso8601
- python3-markdown
- - python3-pexpect
- python3-pyasn1
- python3-requests
- python3-setproctitle
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index b4da7b234d0..56996ed8632 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-fb63148d63beac20259d0c61ece2c608d2d1d2a1
+d20548dec714e202867b593f5e19f3004f7a2457
diff --git a/buildtools/wafsamba/samba_autoconf.py
b/buildtools/wafsamba/samba_autoconf.py
index 802cbaced52..d4e27e156e6 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -784,8 +784,9 @@ def SAMBA_CONFIG_H(conf, path=None):
conf.ADD_CFLAGS('-Werror=address', testflags=True)
# we add these here to ensure that -Wstrict-prototypes is not set
during configure
- conf.ADD_CFLAGS('-Werror=strict-prototypes -Wstrict-prototypes',
- testflags=True)
+ if not Options.options.disable_warnings_as_errors:
+ conf.ADD_CFLAGS('-Werror=strict-prototypes -Wstrict-prototypes',
+ testflags=True)
conf.ADD_CFLAGS('-Werror=write-strings -Wwrite-strings',
testflags=True)
conf.ADD_CFLAGS('-Werror-implicit-function-declaration',
diff --git a/libcli/security/security_token.c b/libcli/security/security_token.c
index 0218eed1722..a79f5925ea2 100644
--- a/libcli/security/security_token.c
+++ b/libcli/security/security_token.c
@@ -80,17 +80,22 @@ struct security_token *security_token_duplicate(TALLOC_CTX
*mem_ctx, const struc
****************************************************************************/
void security_token_debug(int dbg_class, int dbg_lev, const struct
security_token *token)
{
- TALLOC_CTX *frame = talloc_stackframe();
+ TALLOC_CTX *frame = NULL;
char *sids = NULL;
char *privs = NULL;
uint32_t i;
+ if (!CHECK_DEBUGLVLC(dbg_class, dbg_lev)) {
+ return;
+ }
+
if (!token) {
DEBUGC(dbg_class, dbg_lev, ("Security token: (NULL)\n"));
- TALLOC_FREE(frame);
return;
}
+ frame = talloc_stackframe();
+
sids = talloc_asprintf(frame,
"Security token SIDs (%" PRIu32 "):\n",
token->num_sids);
diff --git a/python/samba/tdb_util.py b/python/samba/tdb_util.py
index 99b6e02e03f..202fbdb3f8b 100644
--- a/python/samba/tdb_util.py
+++ b/python/samba/tdb_util.py
@@ -37,9 +37,10 @@ def tdb_copy(file1, file2, readonly=False):
raise FileNotFoundError(2, "could not find tdbbackup tool: "
"is tdb-tools installed?")
- tdbbackup_cmd = [toolpath, "-s", ".copy.tdb", file1]
if readonly:
- tdbbackup_cmd.append("-r")
+ tdbbackup_cmd = [toolpath, "-r", "-s", ".copy.tdb", file1]
+ else:
+ tdbbackup_cmd = [toolpath, "-s", ".copy.tdb", file1]
status = subprocess.check_call(tdbbackup_cmd, close_fds=True, shell=False)
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 023ad7cbb02..4dd8036616b 100644
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -888,10 +888,16 @@ NTSTATUS finalize_local_nt_token(struct security_token
*result,
void debug_unix_user_token(int dbg_class, int dbg_lev, uid_t uid, gid_t gid,
int n_groups, gid_t *groups)
{
- TALLOC_CTX *frame = talloc_stackframe();
+ TALLOC_CTX *frame = NULL;
char *s = NULL;
int i;
+ if (!CHECK_DEBUGLVLC(dbg_class, dbg_lev)) {
+ return;
+ }
+
+ frame = talloc_stackframe();
+
s = talloc_asprintf(frame,
"UNIX token of user %ld\n",
(long int)uid);
diff --git a/source3/client/client.c b/source3/client/client.c
index e2dd700314c..d1ccc8cb54e 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1959,7 +1959,7 @@ static int do_put(const char *rname, const char *lname,
bool reput)
put_total_time_ms += this_time;
put_total_size += state.nread;
- DEBUG(1,("(%3.1f kb/s) (average %3.1f kb/s)\n",
+ DEBUG(1,("(%3.1f kB/s) (average %3.1f kB/s)\n",
state.nread / (1.024*this_time + 1.0e-4),
put_total_size / (1.024*put_total_time_ms)));
}
@@ -4379,7 +4379,7 @@ static int scopy_status(off_t written, void *priv)
clock_gettime_mono(&tp_end);
scopy_total_time_ms = nsec_time_diff(&tp_end,&st->tp_start)/1000000;
- DEBUG(5,("Copied %jd bytes at an average %3.1f kb/s\n",
+ DEBUG(5,("Copied %jd bytes at an average %3.1f kB/s\n",
(intmax_t)written, written / (1.024*scopy_total_time_ms)));
return true;
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 0a915d79bc6..8bc4320eb43 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -11363,7 +11363,7 @@ static bool run_windows_write(int dummy)
kbytes = (double)torture_blocksize * torture_numops;
kbytes /= 1024;
- printf("Wrote %d kbytes in %.2f seconds: %d kb/sec\n", (int)kbytes,
+ printf("Wrote %d kbytes in %.2f seconds: %d kB/sec\n", (int)kbytes,
(double)seconds, (int)(kbytes/seconds));
ret = true;
diff --git a/source4/client/client.c b/source4/client/client.c
index 33733efa390..8debb61c6ff 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -811,7 +811,7 @@ static int do_get(struct smbclient_context *ctx, char
*rname, const char *p_lnam
get_total_time_ms += this_time;
get_total_size += nread;
- DEBUG(2,("(%3.1f kb/s) (average %3.1f kb/s)\n",
+ DEBUG(2,("(%3.1f kB/s) (average %3.1f kB/s)\n",
nread / (1.024*this_time + 1.0e-4),
get_total_size / (1.024*get_total_time_ms)));
}
@@ -1227,7 +1227,7 @@ static int do_put(struct smbclient_context *ctx, char
*rname, char *lname, bool
put_total_time_ms += this_time;
put_total_size += nread;
- DEBUG(1,("(%3.1f kb/s) (average %3.1f kb/s)\n",
+ DEBUG(1,("(%3.1f kB/s) (average %3.1f kB/s)\n",
nread / (1.024*this_time + 1.0e-4),
put_total_size / (1.024*put_total_time_ms)));
}
--
Samba Shared Repository
