The branch, master has been updated
via b09f0bb4d40 test: Fix the FreeBSD build
via efb3c7425e1 smbd: Fix the 32-bit build on FreeBSD
via cff22bccf93 wbinfo: Align some integer types
via 05f7558b4c4 lib: Change make_file_id_from_itime() prototype
via 7bd51217504 torture: Align integer types
via f03113582f2 libsmb: Slightly beautify internal_resolve_name()
via d82cd10f954 libsmb: Move a variable closer to its use in
internal_resolve_name()
via d1be9eee674 samldb: Align two integer types
via e098610d6a0 test: smbtorture3's OPLOCK5 test only available with
kernel oplocks
via 7fc62fd1124 libsmb: Align integer types
via f85adfb2efa libsmb: Fix a typo
via 5a0baf49250 winbind: Align integer types
via fce49f4ac21 libcli: Align integer types
via 38a0724fd05 librpc: talloc_stackframe() panics on failure
via fd12464840e librpc: Make ep_register a bit easier to understand
via f53117e03f5 librpc: Fix a talloc_stackframe() leak
via a41112fcc98 libcli: Align a few integer types
via 5c81a5a0d98 docs: Fix "async dns timeout" manpage entry
via ccb7d44482a loadparm: Simplify lp_get_async_dns_timeout()
via a613ebc09d2 dsgetdcname: Fix talloc hierarchy
from 7f7e2b0e1e1 tests python krb5: Extra canonicalization tests
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b09f0bb4d40affa3a6b01374174d555b539c4264
Author: Volker Lendecke <v...@samba.org>
Date: Thu Nov 26 14:30:36 2020 +0100
test: Fix the FreeBSD build
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): Mon Nov 30 23:48:02 UTC 2020 on sn-devel-184
commit efb3c7425e1e63f06fbb1523cadae6482ee8edfb
Author: Volker Lendecke <v...@samba.org>
Date: Thu Nov 26 14:23:24 2020 +0100
smbd: Fix the 32-bit build on FreeBSD
log->rec_index is not size_t, it's uint64_t
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit cff22bccf933e1beb46a73f27c77cb73bdb58587
Author: Volker Lendecke <v...@samba.org>
Date: Thu Nov 26 14:18:20 2020 +0100
wbinfo: Align some integer types
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 05f7558b4c42a0e335d65c9acd4b74701a149523
Author: Volker Lendecke <v...@samba.org>
Date: Mon Nov 23 15:37:44 2020 +0100
lib: Change make_file_id_from_itime() prototype
SMB_STRUCT_STAT is defined in includes.h. This way including file_id.h
is possible without including includes.h
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 7bd5121750435c2903ff5539063b0cf92a1d6420
Author: Volker Lendecke <v...@samba.org>
Date: Mon Nov 23 16:15:34 2020 +0100
torture: Align integer types
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit f03113582f2ccf50c99d2b5a39e2656248f71d8e
Author: Volker Lendecke <v...@samba.org>
Date: Tue Nov 24 21:22:55 2020 +0100
libsmb: Slightly beautify internal_resolve_name()
We have "goto done;" at the end of every if-branch, we don't need
else.
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit d82cd10f954d628d0bf6192bbd3f02f4f900eb08
Author: Volker Lendecke <v...@samba.org>
Date: Tue Nov 24 21:24:34 2020 +0100
libsmb: Move a variable closer to its use in internal_resolve_name()
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit d1be9eee67412d02169fdef83adca16f37f7e37e
Author: Volker Lendecke <v...@samba.org>
Date: Wed Nov 25 16:33:32 2020 +0100
samldb: Align two integer types
ARRAY_SIZE is size_t
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit e098610d6a002bde60d645a807e681a27647c11d
Author: Volker Lendecke <v...@samba.org>
Date: Thu Nov 26 09:56:50 2020 +0100
test: smbtorture3's OPLOCK5 test only available with kernel oplocks
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 7fc62fd11241f044eaa0ccfb0451c4aa42025a74
Author: Volker Lendecke <v...@samba.org>
Date: Mon Nov 23 12:27:38 2020 +0100
libsmb: Align integer types
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit f85adfb2efae8e0efcf571f944ed29cf7699192c
Author: Volker Lendecke <v...@samba.org>
Date: Sat Nov 21 21:17:39 2020 +0100
libsmb: Fix a typo
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 5a0baf4925035f1060c33281efb57d1814a8ef79
Author: Volker Lendecke <v...@samba.org>
Date: Sat Nov 21 13:02:28 2020 +0100
winbind: Align integer types
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit fce49f4ac21df95c444c49f7bb30dd79f88354c8
Author: Volker Lendecke <v...@samba.org>
Date: Sat Nov 14 16:31:09 2020 +0100
libcli: Align integer types
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 38a0724fd0513e2e88afcfd365940fc52efd78af
Author: Volker Lendecke <v...@samba.org>
Date: Sat Nov 14 10:16:57 2020 +0100
librpc: talloc_stackframe() panics on failure
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit fd12464840e9757c088ebf33e8054f460a332f2e
Author: Volker Lendecke <v...@samba.org>
Date: Sat Nov 14 10:15:33 2020 +0100
librpc: Make ep_register a bit easier to understand
I found the pointer dereference a bit confusing
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit f53117e03f5f8d523248f537383fa43799aa26e6
Author: Volker Lendecke <v...@samba.org>
Date: Sat Nov 14 10:12:20 2020 +0100
librpc: Fix a talloc_stackframe() leak
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit a41112fcc984c19d5123e4a49a5f5fd4341e811d
Author: Volker Lendecke <v...@samba.org>
Date: Sun Nov 29 18:25:07 2020 +0100
libcli: Align a few integer types
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 5c81a5a0d9833fb57153333e8b7ef7dd5fb540bd
Author: Volker Lendecke <v...@samba.org>
Date: Sun Nov 29 13:06:34 2020 +0100
docs: Fix "async dns timeout" manpage entry
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit ccb7d44482a3a59f16d06c591e68ce2ff85f1f43
Author: Volker Lendecke <v...@samba.org>
Date: Sun Nov 29 13:05:02 2020 +0100
loadparm: Simplify lp_get_async_dns_timeout()
Use MAX, and per README.Coding we don't need the intermediate
variable. This can be inspected in the debugger directly.
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit a613ebc09d22869e47e63e17f687f44264292556
Author: Volker Lendecke <v...@samba.org>
Date: Fri Nov 27 22:00:10 2020 +0100
dsgetdcname: Fix talloc hierarchy
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/tuning/asyncdnstimeout.xml | 3 +--
libcli/smb/util.c | 2 +-
libcli/util/doserr.c | 2 +-
libcli/util/errmap_unix.c | 2 +-
libcli/util/hresult.c | 4 ++--
nsswitch/wbinfo.c | 11 ++++-----
source3/lib/file_id.c | 2 +-
source3/lib/file_id.h | 3 ++-
source3/librpc/rpc/dcerpc_ep.c | 8 +++----
source3/libsmb/dsgetdcname.c | 2 +-
source3/libsmb/libsmb_xattr.c | 2 +-
source3/libsmb/namequery.c | 32 ++++++++++++++++----------
source3/modules/test_vfs_posixacl.c | 12 ++++++++++
source3/param/loadparm.c | 6 +----
source3/selftest/tests.py | 27 +++++++++++-----------
source3/smbd/notifyd/notifyd.c | 2 +-
source3/winbindd/winbindd_dsgetdcname.c | 2 +-
source4/dsdb/samdb/ldb_modules/samldb.c | 6 +++--
source4/torture/vfs/fruit.c | 4 ++--
19 files changed, 73 insertions(+), 59 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/tuning/asyncdnstimeout.xml
b/docs-xml/smbdotconf/tuning/asyncdnstimeout.xml
index 6c7ead2b2fd..522ef2016f8 100644
--- a/docs-xml/smbdotconf/tuning/asyncdnstimeout.xml
+++ b/docs-xml/smbdotconf/tuning/asyncdnstimeout.xml
@@ -12,8 +12,7 @@
waiting for DNS server timeouts.
</para>
<para>The minimum value of this parameter is clamped
- at 1 second.
- zero.</para>
+ at 1 second.</para>
</description>
<value type="default">10</value>
diff --git a/libcli/smb/util.c b/libcli/smb/util.c
index ac2887ee5c4..84ec80c605b 100644
--- a/libcli/smb/util.c
+++ b/libcli/smb/util.c
@@ -67,7 +67,7 @@ const char *smb_protocol_types_string(enum protocol_types
protocol)
**/
char *attrib_string(TALLOC_CTX *mem_ctx, uint32_t attrib)
{
- int i, len;
+ size_t i, len;
const struct {
char c;
uint16_t attr;
diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index 237854c148d..99fd72225bf 100644
--- a/libcli/util/doserr.c
+++ b/libcli/util/doserr.c
@@ -125,7 +125,7 @@ const char *win_errstr(WERROR werror)
const char *get_friendly_werror_msg(WERROR werror)
{
- int i = 0;
+ size_t i = 0;
for (i = 0; i < ARRAY_SIZE(dos_err_strs); i++) {
if (W_ERROR_V(dos_err_strs[i].werror) ==
diff --git a/libcli/util/errmap_unix.c b/libcli/util/errmap_unix.c
index 8f9f89835ed..9ac680919d8 100644
--- a/libcli/util/errmap_unix.c
+++ b/libcli/util/errmap_unix.c
@@ -142,7 +142,7 @@ static const struct {
*********************************************************************/
NTSTATUS map_nt_error_from_unix_common(int unix_error)
{
- int i;
+ size_t i;
/* Look through list */
for (i=0;i<ARRAY_SIZE(unix_nt_errmap);i++) {
diff --git a/libcli/util/hresult.c b/libcli/util/hresult.c
index 2bea98936f8..0ac116430b4 100644
--- a/libcli/util/hresult.c
+++ b/libcli/util/hresult.c
@@ -14676,7 +14676,7 @@ static const struct {
const char *hresult_errstr_const(HRESULT err_code)
{
const char *result = NULL;
- int i;
+ size_t i;
for (i = 0; i < ARRAY_SIZE(hresult_errs); ++i) {
if (HRES_IS_EQUAL(err_code, hresult_errs[i].error_code)) {
result = hresult_errs[i].error_message;
@@ -14694,7 +14694,7 @@ const char *hresult_errstr_const(HRESULT err_code)
const char *hresult_errstr(HRESULT err_code)
{
static char msg[22];
- int i;
+ size_t i;
for (i = 0; i < ARRAY_SIZE(hresult_errs); i++) {
if (HRES_IS_EQUAL(err_code, hresult_errs[i].error_code)) {
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 6cd795ea72e..7860632bad1 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -507,10 +507,9 @@ static bool wbinfo_wins_byip(const char *ip)
static bool wbinfo_list_domains(bool list_all_domains, bool verbose)
{
struct wbcDomainInfo *domain_list = NULL;
- size_t num_domains;
+ size_t i, num_domains;
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
bool print_all = !list_all_domains && verbose;
- int i;
wbc_status = wbcListTrusts(&domain_list, &num_domains);
if (!WBC_ERROR_IS_OK(wbc_status)) {
@@ -617,9 +616,8 @@ static bool wbinfo_show_sequence(const char *domain)
static bool wbinfo_show_onlinestatus(const char *domain)
{
struct wbcDomainInfo *domain_list = NULL;
- size_t num_domains;
+ size_t i, num_domains;
wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
- int i;
wbc_status = wbcListTrusts(&domain_list, &num_domains);
if (!WBC_ERROR_IS_OK(wbc_status)) {
@@ -1387,8 +1385,7 @@ static bool wbinfo_lookuprids(const char *domain, const
char *arg)
char *domain_name = NULL;
const char **names = NULL;
enum wbcSidType *types = NULL;
- size_t i;
- int num_rids;
+ size_t i, num_rids;
uint32_t *rids = NULL;
const char *p;
char *ridstr;
@@ -1704,7 +1701,7 @@ static bool wbinfo_auth_krb5(char *username, const char
*cctype, uint32_t flags)
}
if (info) {
- int i;
+ size_t i;
for (i=0; i < info->num_blobs; i++) {
if (strequal(info->blobs[i].name,
"krb5ccname")) {
diff --git a/source3/lib/file_id.c b/source3/lib/file_id.c
index 0cc5a56bc27..6bfcf1463d2 100644
--- a/source3/lib/file_id.c
+++ b/source3/lib/file_id.c
@@ -81,7 +81,7 @@ void pull_file_id_24(const char *buf, struct file_id *id)
id->extid |= ((uint64_t)IVAL(buf,20))<<32;
}
-uint64_t make_file_id_from_itime(SMB_STRUCT_STAT *st)
+uint64_t make_file_id_from_itime(const struct stat_ex *st)
{
struct timespec itime = st->st_ex_itime;
ino_t ino = st->st_ex_ino;
diff --git a/source3/lib/file_id.h b/source3/lib/file_id.h
index a946cb4d692..630d154c077 100644
--- a/source3/lib/file_id.h
+++ b/source3/lib/file_id.h
@@ -44,6 +44,7 @@ void pull_file_id_24(const char *buf, struct file_id *id);
/*
* Make a SMB File-ID from itime
*/
-uint64_t make_file_id_from_itime(SMB_STRUCT_STAT *st);
+struct stat_ex;
+uint64_t make_file_id_from_itime(const struct stat_ex *st);
#endif
diff --git a/source3/librpc/rpc/dcerpc_ep.c b/source3/librpc/rpc/dcerpc_ep.c
index 6ac098c1b03..fec5f6ca1b7 100644
--- a/source3/librpc/rpc/dcerpc_ep.c
+++ b/source3/librpc/rpc/dcerpc_ep.c
@@ -84,9 +84,6 @@ static NTSTATUS ep_register(TALLOC_CTX *mem_ctx,
}
tmp_ctx = talloc_stackframe();
- if (tmp_ctx == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
epmd_mode = rpc_epmapper_mode();
@@ -100,7 +97,8 @@ static NTSTATUS ep_register(TALLOC_CTX *mem_ctx,
0,
&local);
if (rc < 0) {
- return NT_STATUS_NO_MEMORY;
+ status = NT_STATUS_NO_MEMORY;
+ goto done;
}
status = rpcint_binding_handle(tmp_ctx,
@@ -246,8 +244,8 @@ static NTSTATUS ep_register(TALLOC_CTX *mem_ctx,
}
if (pbh != NULL) {
+ talloc_steal(h, cli);
*pbh = talloc_move(mem_ctx, &h);
- talloc_steal(*pbh, cli);
}
done:
diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index 4fdfe07b06a..e6eb7efc4e9 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -601,7 +601,7 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx,
}
dclist[ret_count].hostname =
- talloc_move(mem_ctx, &dcs[i].hostname);
+ talloc_move(dclist, &dcs[i].hostname);
/*
* Pick the first IPv4 address,
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index e28eb7ca6c7..0751c65d58a 100644
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -2301,7 +2301,7 @@ SMBC_removexattr_ctx(SMBCCTX *context,
}
/*
- * Are they asking to remove one or more spceific security descriptor
+ * Are they asking to remove one or more specific security descriptor
* attributes?
*/
if (strcasecmp_m(name, "system.nt_sec_desc.revision") == 0 ||
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 1e109ecc371..d4ccafaec08 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -1509,7 +1509,7 @@ static bool name_query_validator(struct packet_struct *p,
void *private_data)
struct sockaddr_storage addr;
struct samba_sockaddr sa = {0};
bool ok;
- int j;
+ size_t j;
flags = RSVAL(&nmb->answers->rdata[i*6], 0);
got_unique_netbios_name |= ((flags & 0x8000) == 0);
@@ -3170,7 +3170,6 @@ NTSTATUS internal_resolve_name(TALLOC_CTX *ctx,
size_t *return_count,
const char **resolve_order)
{
- const char *tok;
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
size_t i;
size_t nc_count = 0;
@@ -3268,9 +3267,9 @@ NTSTATUS internal_resolve_name(TALLOC_CTX *ctx,
/* iterate through the name resolution backends */
for (i=0; resolve_order[i]; i++) {
- tok = resolve_order[i];
+ const char *tok = resolve_order[i];
- if((strequal(tok, "host") || strequal(tok, "hosts"))) {
+ if ((strequal(tok, "host") || strequal(tok, "hosts"))) {
status = resolve_hosts(talloc_tos(),
name,
name_type,
@@ -3280,7 +3279,9 @@ NTSTATUS internal_resolve_name(TALLOC_CTX *ctx,
continue;
}
goto done;
- } else if(strequal( tok, "kdc")) {
+ }
+
+ if (strequal(tok, "kdc")) {
/* deal with KDC_NAME_TYPE names here.
* This will result in a SRV record lookup */
status = resolve_ads(talloc_tos(),
@@ -3296,7 +3297,9 @@ NTSTATUS internal_resolve_name(TALLOC_CTX *ctx,
* this with the KDC port. */
name_type = KDC_NAME_TYPE;
goto done;
- } else if(strequal( tok, "ads")) {
+ }
+
+ if (strequal(tok, "ads")) {
/* deal with 0x1c and 0x1b names here.
* This will result in a SRV record lookup */
status = resolve_ads(talloc_tos(),
@@ -3309,7 +3312,9 @@ NTSTATUS internal_resolve_name(TALLOC_CTX *ctx,
continue;
}
goto done;
- } else if (strequal(tok, "lmhosts")) {
+ }
+
+ if (strequal(tok, "lmhosts")) {
status = resolve_lmhosts_file_as_sockaddr(
talloc_tos(),
get_dyn_LMHOSTSFILE(),
@@ -3321,7 +3326,9 @@ NTSTATUS internal_resolve_name(TALLOC_CTX *ctx,
continue;
}
goto done;
- } else if (strequal(tok, "wins")) {
+ }
+
+ if (strequal(tok, "wins")) {
/* don't resolve 1D via WINS */
if (name_type == 0x1D) {
continue;
@@ -3335,7 +3342,9 @@ NTSTATUS internal_resolve_name(TALLOC_CTX *ctx,
continue;
}
goto done;
- } else if (strequal(tok, "bcast")) {
+ }
+
+ if (strequal(tok, "bcast")) {
status = name_resolve_bcast(
talloc_tos(),
name,
@@ -3346,10 +3355,9 @@ NTSTATUS internal_resolve_name(TALLOC_CTX *ctx,
continue;
}
goto done;
- } else {
- DBG_ERR("unknown name switch type %s\n",
- tok);
}
+
+ DBG_ERR("unknown name switch type %s\n", tok);
}
/* All of the resolve_* functions above have returned false. */
diff --git a/source3/modules/test_vfs_posixacl.c
b/source3/modules/test_vfs_posixacl.c
index e5a333334ed..19e7d984277 100644
--- a/source3/modules/test_vfs_posixacl.c
+++ b/source3/modules/test_vfs_posixacl.c
@@ -86,13 +86,25 @@ static void acl_check_entry(acl_entry_t acl_entry,
SMB_ACL_TAG_T tag,
assert_int_equal(*id_p, id);
}
+#ifdef HAVE_ACL_GET_PERM_NP
+ ret = acl_get_perm_np(acl_permset, ACL_READ);
+#else
ret = acl_get_perm(acl_permset, ACL_READ);
+#endif
assert_int_equal(ret, read ? 1 : 0);
+#ifdef HAVE_ACL_GET_PERM_NP
+ ret = acl_get_perm_np(acl_permset, ACL_WRITE);
+#else
ret = acl_get_perm(acl_permset, ACL_WRITE);
+#endif
assert_int_equal(ret, write ? 1 : 0);
+#ifdef HAVE_ACL_GET_PERM_NP
+ ret = acl_get_perm_np(acl_permset, ACL_EXECUTE);
+#else
ret = acl_get_perm(acl_permset, ACL_EXECUTE);
+#endif
assert_int_equal(ret, execute ? 1 : 0);
}
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index c218e2fc372..fbeed6782ad 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4763,13 +4763,9 @@ enum samba_weak_crypto lp_weak_crypto()
uint32_t lp_get_async_dns_timeout(void)
{
- uint32_t val = Globals.async_dns_timeout;
/*
* Clamp minimum async dns timeout to 1 second
* as per the man page.
*/
- if (val < 1) {
- val = 1;
- }
- return val;
+ return MAX(Globals.async_dns_timeout, 1);
}
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 6cfb98e2bb6..349be8cd7da 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -129,19 +129,20 @@ for t in fileserver_tests:
t = "TLDAP"
plantestsuite("samba3.smbtorture_s3.plain.%s" % t, "ad_dc",
[os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t,
'//$SERVER/tmp', '$DC_USERNAME', '$DC_PASSWORD', smbtorture3, "", "-l
$LOCAL_PATH"])
-t = "OPLOCK5"
-plantestsuite("samba3.smbtorture_s3.plain.%s" % t,
- "fileserver_smb1",
- [os.path.join(samba3srcdir,
- "script/tests/test_smbtorture_s3.sh"),
- t,
- '//$SERVER/tmp',
- '$USERNAME',
- '$PASSWORD',
- smbtorture3,
- "",
- "-l $LOCAL_PATH",
- "-mNT1"])
+if have_linux_kernel_oplocks:
+ t = "OPLOCK5"
+ plantestsuite("samba3.smbtorture_s3.plain.%s" % t,
+ "fileserver_smb1",
+ [os.path.join(samba3srcdir,
+ "script/tests/test_smbtorture_s3.sh"),
+ t,
+ '//$SERVER/tmp',
+ '$USERNAME',
+ '$PASSWORD',
+ smbtorture3,
+ "",
+ "-l $LOCAL_PATH",
+ "-mNT1"])
#
# RENAME-ACCESS needs to run against a special share -
acl_xattr_ign_sysacl_windows
#
diff --git a/source3/smbd/notifyd/notifyd.c b/source3/smbd/notifyd/notifyd.c
index 601bd168cd8..7d925d6c3b7 100644
--- a/source3/smbd/notifyd/notifyd.c
+++ b/source3/smbd/notifyd/notifyd.c
@@ -946,7 +946,7 @@ static void notifyd_broadcast_reclog(struct
ctdbd_connection *ctdbd_conn,
return;
}
- DBG_DEBUG("rec_index=%zu, num_recs=%"PRIu32"\n",
+ DBG_DEBUG("rec_index=%"PRIu64", num_recs=%"PRIu32"\n",
log->rec_index,
log->num_recs);
diff --git a/source3/winbindd/winbindd_dsgetdcname.c
b/source3/winbindd/winbindd_dsgetdcname.c
index e3640487346..d001213c875 100644
--- a/source3/winbindd/winbindd_dsgetdcname.c
+++ b/source3/winbindd/winbindd_dsgetdcname.c
@@ -183,7 +183,7 @@ static uint32_t get_dsgetdc_flags(uint32_t wbc_flags)
};
uint32_t ds_flags = 0;
- int i = 0 ;
+ size_t i = 0;
for (i=0; i<ARRAY_SIZE(lookup_dc_flags); i++) {
if (wbc_flags & lookup_dc_flags[i].wbc_dc_flag) {
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c
b/source4/dsdb/samdb/ldb_modules/samldb.c
index 71338340c81..f1e0b5cf650 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -1878,7 +1878,8 @@ static int samldb_prim_group_trigger(struct samldb_ctx
*ac)
static int samldb_check_user_account_control_invariants(struct samldb_ctx *ac,
uint32_t
user_account_control)
{
- int i, ret = 0;
+ size_t i;
+ int ret = 0;
bool need_check = false;
const struct uac_to_guid {
uint32_t uac;
@@ -1988,7 +1989,8 @@ static int samldb_check_user_account_control_acl(struct
samldb_ctx *ac,
uint32_t user_account_control,
uint32_t
user_account_control_old)
{
- int i, ret = 0;
+ size_t i;
+ int ret = 0;
bool need_acl_check = false;
struct ldb_result *res;
const char * const sd_attrs[] = {"ntSecurityDescriptor", NULL};
diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c
index a094ce0ab65..113f4792092 100644
--- a/source4/torture/vfs/fruit.c
+++ b/source4/torture/vfs/fruit.c
@@ -5047,7 +5047,7 @@ static bool test_readdir_attr_illegal_ntfs(struct
torture_context *tctx,
unsigned int count;
union smb_search_data *d;
uint64_t rfork_len;
- int i;
+ unsigned int i;
smb2_deltree(tree, BASEDIR);
@@ -5780,7 +5780,7 @@ static bool test_copy_chunk_streams(struct
torture_context *torture,
{ "src:foo", "dst:foo" },
{ "src" AFPRESOURCE_STREAM, "dst" AFPRESOURCE_STREAM }
};
- int i;
+ size_t i;
TALLOC_CTX *tmp_ctx = NULL;
bool ok = false;
--
Samba Shared Repository
