[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Sun May 19 18:48:02 UTC 2019
The branch, master has been updated
via 594676c8b8f s3: torture: Fix return values
via 730037504d2 s3: libsmbclient: Fix return value if cli_open() fails
via 3a4f23636d6 vfs_gpfs: Fix return value if getting data fails
via 18965c0b848 vfs_catia: Fix return value in lock functions
via 519d72c5785 Fix uClibc build on 64bit platforms by including stdint.h
via 9a1df272f6c docs: Fix typo
from 07bbcf3aeca smbd: Send "share_file_id" with the rename msg
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 594676c8b8f9138c013871a5da01fca67e1aa282
Author: Rikard Falkeborn <rikard.falkeborn at gmail.com>
Date: Thu May 16 21:43:46 2019 +0200
s3: torture: Fix return values
Torture tests should return true on success and false on failure.
Returning -1 is the same as returning true and returning 0 is the same
as returning false. Change the return values to true and false to fix
the return values.
Detected by the help of cppcheck.
Signed-off-by: Rikard Falkeborn <rikard.falkeborn at gmail.com>
Reviewed-by: Ralph Böhme <slow at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Sun May 19 18:48:01 UTC 2019 on sn-devel-184
commit 730037504d2c29e43a075d22b17f761f1d2e837a
Author: Rikard Falkeborn <rikard.falkeborn at gmail.com>
Date: Thu May 16 21:03:42 2019 +0200
s3: libsmbclient: Fix return value if cli_open() fails
Returning -1 in a function with bool as return value type is the same
as returning true. Change to false to indicate the error.
Detected by the help of cppcheck.
Signed-off-by: Rikard Falkeborn <rikard.falkeborn at gmail.com>
Reviewed-by: Ralph Böhme <slow at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 3a4f23636d60799a3d3b80d395ef7af710195919
Author: Rikard Falkeborn <rikard.falkeborn at gmail.com>
Date: Thu May 16 21:29:52 2019 +0200
vfs_gpfs: Fix return value if getting data fails
Returning -1 in a function with bool as return value type is the same
as returning true. Change to false to indicate the error.
Detected by the help of cppcheck.
Signed-off-by: Rikard Falkeborn <rikard.falkeborn at gmail.com>
Reviewed-by: Ralph Böhme <slow at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 18965c0b84847aa0479a2b371339c309ac5d64a2
Author: Rikard Falkeborn <rikard.falkeborn at gmail.com>
Date: Thu May 16 21:21:11 2019 +0200
vfs_catia: Fix return value in lock functions
Returning -1 in a function with bool as return value type is the same
as returning true. Change to false to indicate the error.
Detected by the help of cppcheck.
Signed-off-by: Rikard Falkeborn <rikard.falkeborn at gmail.com>
Reviewed-by: Ralph Böhme <slow at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 519d72c57857bfa51ab84a478be687e5c34f9a2c
Author: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Date: Sat May 18 12:42:17 2019 +0200
Fix uClibc build on 64bit platforms by including stdint.h
Fixes an error detected by buildroot autobuilders:
http://autobuild.buildroot.net/results/573/573e2268e205e10d1352fa81122d8f225fdb4575/build-end.log
/home/rclinux/rc-buildroot-test/scripts/instance-1/output/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/stdint.h:122:27:
error: conflicting types for 'uintptr_t'
typedef unsigned long int uintptr_t;
^
In file included from ../lib/ldb/tests/ldb_msg.c:17:0:
../third_party/cmocka/cmocka.h:126:28: note: previous declaration of 'uintptr_t' was here
typedef unsigned int uintptr_t;
The define __WORDSIZE is missing when cmocka.h decides how to
define uintptr_t, this patch includes stdint.h when needed.
Patch sent upstream:
https://lists.samba.org/archive/samba-technical/2018-January/125306.html
[updated for samba-4.8.4, v2 sent upstream
https://lists.samba.org/archive/samba-technical/2018-August/129732.html,
updated for samba-4.9.1]
Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
[Retrieved from:
https://git.buildroot.net/buildroot/tree/package/samba4/0003-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Reviewed-by: Ralph Böhme <slow at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 9a1df272f6c3d8a4bacb52d4252e90706afcd147
Author: Juergen Hoetzel <juergen at archlinux.org>
Date: Sun May 19 11:24:28 2019 +0200
docs: Fix typo
Signed-off-by: Juergen Hoetzel <juergen at archlinux.org>
Reviewed-by: Ralph Böhme <slow at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/security/passwdchat.xml | 2 +-
lib/ldb/tests/ldb_kv_ops_test.c | 1 +
lib/ldb/tests/ldb_tdb_test.c | 1 +
lib/ldb/tests/test_ldb_qsort.c | 1 +
lib/util/tests/test_ms_fnmatch.c | 1 +
source3/lib/test_tldap.c | 1 +
source3/libsmb/libsmb_file.c | 2 +-
source3/modules/vfs_catia.c | 6 +++---
source3/modules/vfs_gpfs.c | 2 +-
source3/torture/test_addrchange.c | 10 +++++-----
10 files changed, 16 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/security/passwdchat.xml b/docs-xml/smbdotconf/security/passwdchat.xml
index bce0d43fedf..c9434b00098 100644
--- a/docs-xml/smbdotconf/security/passwdchat.xml
+++ b/docs-xml/smbdotconf/security/passwdchat.xml
@@ -28,7 +28,7 @@
<para>The string can contain the macro <parameter
moreinfo="none">%n</parameter> which is substituted
- for the new password. The old passsword (<parameter
+ for the new password. The old password (<parameter
moreinfo="none">%o</parameter>) is only available when
<smbconfoption name="encrypt passwords"/> has been disabled.
The chat sequence can also contain the standard macros
diff --git a/lib/ldb/tests/ldb_kv_ops_test.c b/lib/ldb/tests/ldb_kv_ops_test.c
index 57a4711706c..c16297e136b 100644
--- a/lib/ldb/tests/ldb_kv_ops_test.c
+++ b/lib/ldb/tests/ldb_kv_ops_test.c
@@ -49,6 +49,7 @@
*/
#include <stdarg.h>
#include <stddef.h>
+#include <stdint.h>
#include <setjmp.h>
#include <cmocka.h>
diff --git a/lib/ldb/tests/ldb_tdb_test.c b/lib/ldb/tests/ldb_tdb_test.c
index 8418dbfd671..ef91ba54756 100644
--- a/lib/ldb/tests/ldb_tdb_test.c
+++ b/lib/ldb/tests/ldb_tdb_test.c
@@ -40,6 +40,7 @@
*/
#include <stdarg.h>
#include <stddef.h>
+#include <stdint.h>
#include <setjmp.h>
#include <cmocka.h>
diff --git a/lib/ldb/tests/test_ldb_qsort.c b/lib/ldb/tests/test_ldb_qsort.c
index 06e80d94379..663cf0e7564 100644
--- a/lib/ldb/tests/test_ldb_qsort.c
+++ b/lib/ldb/tests/test_ldb_qsort.c
@@ -19,6 +19,7 @@
#include <stdarg.h>
#include <stddef.h>
+#include <stdint.h>
#include <setjmp.h>
#include <cmocka.h>
diff --git a/lib/util/tests/test_ms_fnmatch.c b/lib/util/tests/test_ms_fnmatch.c
index 7fe8ed05e28..d11c7bed4be 100644
--- a/lib/util/tests/test_ms_fnmatch.c
+++ b/lib/util/tests/test_ms_fnmatch.c
@@ -19,6 +19,7 @@
#include <stdarg.h>
#include <stddef.h>
+#include <stdint.h>
#include <setjmp.h>
#include <cmocka.h>
diff --git a/source3/lib/test_tldap.c b/source3/lib/test_tldap.c
index a6c2f2117cb..659c5a7371a 100644
--- a/source3/lib/test_tldap.c
+++ b/source3/lib/test_tldap.c
@@ -20,6 +20,7 @@
#include <stdarg.h>
#include <stddef.h>
+#include <stdint.h>
#include <setjmp.h>
#include <cmocka.h>
diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c
index ebd0bfe422a..be9bcd936b2 100644
--- a/source3/libsmb/libsmb_file.c
+++ b/source3/libsmb/libsmb_file.c
@@ -619,7 +619,7 @@ SMBC_setatr(SMBCCTX * context, SMBCSRV *srv, char *path,
if (!NT_STATUS_IS_OK(cli_open(srv->cli, path, O_RDWR, DENY_NONE, &fd))) {
errno = SMBC_errno(context, srv->cli);
TALLOC_FREE(frame);
- return -1;
+ return False;
}
/* Set the new attributes */
diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index c362be764cc..5915e40ff28 100644
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -2116,7 +2116,7 @@ static bool catia_lock(vfs_handle_struct *handle,
ret = CATIA_FETCH_FSP_PRE_NEXT(talloc_tos(), handle, fsp, &cc);
if (ret != 0) {
- return -1;
+ return false;
}
ok = SMB_VFS_NEXT_LOCK(handle, fsp, op, offset, count, type);
@@ -2178,7 +2178,7 @@ static bool catia_getlock(vfs_handle_struct *handle,
ret = CATIA_FETCH_FSP_PRE_NEXT(talloc_tos(), handle, fsp, &cc);
if (ret != 0) {
- return -1;
+ return false;
}
ok = SMB_VFS_NEXT_GETLOCK(handle, fsp, poffset, pcount, ptype, ppid);
@@ -2198,7 +2198,7 @@ static bool catia_strict_lock_check(struct vfs_handle_struct *handle,
ret = CATIA_FETCH_FSP_PRE_NEXT(talloc_tos(), handle, fsp, &cc);
if (ret != 0) {
- return -1;
+ return false;
}
ok = SMB_VFS_NEXT_STRICT_LOCK_CHECK(handle, fsp, plock);
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 52c4e5ef25d..a1fe91d0df4 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -1995,7 +1995,7 @@ static bool vfs_gpfs_is_offline(struct vfs_handle_struct *handle,
SMB_VFS_HANDLE_GET_DATA(handle, config,
struct gpfs_config_data,
- return -1);
+ return false);
if (!config->winattr) {
return false;
diff --git a/source3/torture/test_addrchange.c b/source3/torture/test_addrchange.c
index daf0488aa18..9ccca1c6c51 100644
--- a/source3/torture/test_addrchange.c
+++ b/source3/torture/test_addrchange.c
@@ -34,7 +34,7 @@ bool run_addrchange(int dummy)
ev = samba_tevent_context_init(talloc_tos());
if (ev == NULL) {
d_fprintf(stderr, "tevent_context_init failed\n");
- return -1;
+ return false;
}
status = addrchange_context_create(talloc_tos(), &ctx);
@@ -54,14 +54,14 @@ bool run_addrchange(int dummy)
req = addrchange_send(talloc_tos(), ev, ctx);
if (req == NULL) {
d_fprintf(stderr, "addrchange_send failed\n");
- return -1;
+ return false;
}
if (!tevent_req_poll_ntstatus(req, ev, &status)) {
d_fprintf(stderr, "tevent_req_poll_ntstatus failed: "
"%s\n", nt_errstr(status));
TALLOC_FREE(req);
- return -1;
+ return false;
}
status = addrchange_recv(req, &type, &addr);
@@ -69,7 +69,7 @@ bool run_addrchange(int dummy)
if (!NT_STATUS_IS_OK(status)) {
d_fprintf(stderr, "addrchange_recv failed: %s\n",
nt_errstr(status));
- return -1;
+ return false;
}
switch(type) {
@@ -90,5 +90,5 @@ bool run_addrchange(int dummy)
}
TALLOC_FREE(ctx);
TALLOC_FREE(ev);
- return 0;
+ return true;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list