The branch, master has been updated
via 930426db02e lib: On FreeBSD util_paths.c does not find struct stat
via 605d6469357 lib: Fix the 32-bit build
via 53db1a086c1 torture: Fix the 32-bit build
via 0d1890011ef lib: Fix the FreeBSD build
via d7fe63c91a0 winbind: Fix a "format string is not a string literal"
warning
via 1ae9f5d3f74 winbind: Fix the 32-bit build
from b4d7540bb47 gpo: samba-gpupdate use s3 param for registry conf
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 930426db02e493e259128a22aed6ba64d0bff786
Author: Volker Lendecke <v...@samba.org>
Date: Fri Jul 22 19:08:10 2022 +0200
lib: On FreeBSD util_paths.c does not find struct stat
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Sun Jul 24 00:25:49 UTC 2022 on sn-devel-184
commit 605d6469357390e3eb6faf88e7d2be54256c2437
Author: Volker Lendecke <v...@samba.org>
Date: Fri Jul 22 19:25:20 2022 +0200
lib: Fix the 32-bit build
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 53db1a086c164b6b19a1927a39db80fe91889bf6
Author: Volker Lendecke <v...@samba.org>
Date: Fri Jul 22 19:25:37 2022 +0200
torture: Fix the 32-bit build
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 0d1890011ef796998f9d9dbd220c9d2ab239cc82
Author: Volker Lendecke <v...@samba.org>
Date: Fri Jul 22 19:36:59 2022 +0200
lib: Fix the FreeBSD build
"time_t" only comes in via a proper include of <time.h>
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit d7fe63c91a0a824aa317e4f95665d589af5ce804
Author: Volker Lendecke <v...@samba.org>
Date: Fri Jul 22 19:34:57 2022 +0200
winbind: Fix a "format string is not a string literal" warning
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 1ae9f5d3f740e700146337f7b3bc6a740f0e7dd4
Author: Volker Lendecke <v...@samba.org>
Date: Fri Jul 22 19:17:15 2022 +0200
winbind: Fix the 32-bit build
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/compression/testsuite.c | 2 +-
lib/util/time.h | 1 +
lib/util/util_paths.c | 1 +
source3/winbindd/wb_xids2sids.c | 16 ++++++++--------
source3/winbindd/winbindd_pam.c | 3 ++-
source3/winbindd/winbindd_wins_byname.c | 4 ++--
source4/torture/smb2/create.c | 2 +-
7 files changed, 16 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/compression/testsuite.c b/lib/compression/testsuite.c
index 708af2bcbf1..d4dc41bdb19 100644
--- a/lib/compression/testsuite.c
+++ b/lib/compression/testsuite.c
@@ -396,7 +396,7 @@ static bool test_lzxpress_many_zeros(struct torture_context
*test)
elapsed_ns = (
(t_end.tv_sec - t_start.tv_sec) * 1000U * 1000U * 1000U) +
(t_end.tv_nsec - t_start.tv_nsec);
- torture_comment(test, "round-trip time: %lu ns\n", elapsed_ns);
+ torture_comment(test, "round-trip time: %"PRIu64" ns\n", elapsed_ns);
torture_assert(test, elapsed_ns < 3 * 1000U * 1000U * 1000U,
"million zeros round trip tool > 3 seconds");
torture_assert_mem_equal(test, decomp, zeros, N_ZEROS,
diff --git a/lib/util/time.h b/lib/util/time.h
index bdb67de5431..8b61e41ae94 100644
--- a/lib/util/time.h
+++ b/lib/util/time.h
@@ -27,6 +27,7 @@
#include <stdbool.h>
#include <stdint.h>
#include <talloc.h>
+#include <time.h>
#ifndef TIME_T_MIN
/* we use 0 here, because (time_t)-1 means error */
diff --git a/lib/util/util_paths.c b/lib/util/util_paths.c
index 8ac85460fba..d162e0a8295 100644
--- a/lib/util/util_paths.c
+++ b/lib/util/util_paths.c
@@ -26,6 +26,7 @@
#include "dynconfig/dynconfig.h"
#include "lib/util/util_paths.h"
#include "system/passwd.h"
+#include "system/filesys.h"
/**
* @brief Returns an absolute path to a file in the Samba modules directory.
diff --git a/source3/winbindd/wb_xids2sids.c b/source3/winbindd/wb_xids2sids.c
index 48faa21810d..86bd7f9deab 100644
--- a/source3/winbindd/wb_xids2sids.c
+++ b/source3/winbindd/wb_xids2sids.c
@@ -61,7 +61,7 @@ static struct tevent_req *wb_xids2sids_dom_send(
return NULL;
}
- D_DEBUG("Searching for %lu xid(s) in domain %s.\n",
+ D_DEBUG("Searching for %zu xid(s) in domain %s.\n",
num_xids,
dom_map->name);
@@ -86,23 +86,23 @@ static struct tevent_req *wb_xids2sids_dom_send(
if ((id.id < dom_map->low_id) || (id.id > dom_map->high_id)) {
/* out of range */
- D_DEBUG("%lu: XID %"PRIu32" is out of range.\n",
+ D_DEBUG("%zu: XID %"PRIu32" is out of range.\n",
i, id.id);
continue;
}
if (state->cached[i]) {
/* already found in cache */
- D_DEBUG("%lu: XID %"PRIu32" is already found in
cache.\n",
+ D_DEBUG("%zu: XID %"PRIu32" is already found in
cache.\n",
i, id.id);
continue;
}
if (!is_null_sid(&state->all_sids[i])) {
/* already mapped in a previously asked domain */
- D_DEBUG("%lu: XID %"PRIu32" is already mapped in a
previously asked domain.\n",
+ D_DEBUG("%zu: XID %"PRIu32" is already mapped in a
previously asked domain.\n",
i, id.id);
continue;
}
- D_DEBUG("%lu: XID %"PRIu32" will be looked up via
dcerpc_wbint_UnixIDs2Sids_send().\n",
+ D_DEBUG("%zu: XID %"PRIu32" will be looked up via
dcerpc_wbint_UnixIDs2Sids_send().\n",
i, id.id);
state->dom_xids[state->num_dom_xids++] = id;
}
@@ -160,7 +160,7 @@ static void wb_xids2sids_dom_done(struct tevent_req *subreq)
dom_sid_idx = 0;
- D_DEBUG("Processing response for %lu xid(s).\n", state->num_all_xids);
+ D_DEBUG("Processing response for %zu xid(s).\n", state->num_all_xids);
for (i=0; i<state->num_all_xids; i++) {
struct unixid *id = &state->all_xids[i];
struct dom_sid_buf buf;
@@ -180,7 +180,7 @@ static void wb_xids2sids_dom_done(struct tevent_req *subreq)
sid_copy(&state->all_sids[i], &state->dom_sids[dom_sid_idx]);
*id = state->dom_xids[dom_sid_idx];
- D_DEBUG("%lu: XID %"PRIu32" mapped to SID %s.\n",
+ D_DEBUG("%zu: XID %"PRIu32" mapped to SID %s.\n",
i,
id->id,
dom_sid_str_buf(&state->all_sids[i], &buf));
@@ -412,7 +412,7 @@ NTSTATUS wb_xids2sids_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
if (CHECK_DEBUGLVL(DBGLVL_INFO)) {
for (i = 0; i < state->num_xids; i++) {
struct dom_sid_buf buf;
- D_INFO("%lu: XID %"PRIu32" mapped to SID %s\n",
+ D_INFO("%zu: XID %"PRIu32" mapped to SID %s\n",
i,
state->xids[i].id,
dom_sid_str_buf(&((*sids)[i]), &buf));
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 1963163a865..a16c8d552ab 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -2256,7 +2256,8 @@ NTSTATUS _wbint_PamAuth(struct pipes_struct *p,
}
if (mapped_user != r->in.info->username) {
- domain_user = talloc_asprintf("%s%c%s",
+ domain_user = talloc_asprintf(talloc_tos(),
+ "%s%c%s",
name_domain,
*lp_winbind_separator(),
name_user);
diff --git a/source3/winbindd/winbindd_wins_byname.c
b/source3/winbindd/winbindd_wins_byname.c
index f640cc2dc52..2014714ff01 100644
--- a/source3/winbindd/winbindd_wins_byname.c
+++ b/source3/winbindd/winbindd_wins_byname.c
@@ -127,12 +127,12 @@ NTSTATUS winbindd_wins_byname_recv(struct tevent_req *req,
}
D_NOTICE("Winbind external command WINS_BYNAME end.\n"
- "Received %lu address(es).\n",
+ "Received %zu address(es).\n",
state->num_addrs);
for (i=0; i<state->num_addrs; i++) {
char addr[INET6_ADDRSTRLEN];
print_sockaddr(addr, sizeof(addr), &state->addrs[i]);
- D_NOTICE("%lu: %s\n", i, addr);
+ D_NOTICE("%zu: %s\n", i, addr);
response = talloc_asprintf_append_buffer(
response, "%s%s", addr,
i < (state->num_addrs-1) ? " " : "");
diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c
index 10c5f911603..8f1e94b5773 100644
--- a/source4/torture/smb2/create.c
+++ b/source4/torture/smb2/create.c
@@ -3012,7 +3012,7 @@ static bool test_fileid_unique_object(
if (fileid_array[i] == fileid_array[j]) {
torture_fail(tctx,
talloc_asprintf(tctx,
- "fileid %u == fileid %u
(0x%lu)\n",
+ "fileid %u == fileid %u
(0x%"PRIu64")\n",
i,
j,
fileid_array[i]));
--
Samba Shared Repository
