[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 40bcdb3 vfs_fruit: Fix the 32-bit build
from 37e1502 ctdb-daemon: Remove control CTDB_CONTROL_SET_CALL
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 40bcdb364b99171121f763e8f30024a5c89c80fa
Author: Volker Lendecke v...@samba.org
Date: Sat Jul 11 13:44:05 2015 +0200
vfs_fruit: Fix the 32-bit build
z is only for size_t, here we have off_t
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Andreas Schneider a...@samba.org
Autobuild-User(master): Andreas Schneider a...@cryptomilk.org
Autobuild-Date(master): Mon Jul 13 11:53:47 CEST 2015 on sn-devel-104
---
Summary of changes:
source3/modules/vfs_fruit.c | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index e29440b..8ac4ba1 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -3511,8 +3511,8 @@ static struct tevent_req *fruit_copy_chunk_send(struct
vfs_handle_struct *handle
struct fruit_config_data *config;
off_t to_copy = num;
- DEBUG(10,(soff: %zd, doff: %zd, len: %zd\n,
- src_off, dest_off, num));
+ DEBUG(10,(soff: %ju, doff: %ju, len: %ju\n,
+ (uintmax_t)src_off, (uintmax_t)dest_off, (uintmax_t)num));
SMB_VFS_HANDLE_GET_DATA(handle, config,
struct fruit_config_data,
@@ -3607,8 +3607,9 @@ static void fruit_copy_chunk_done(struct tevent_req
*subreq)
}
for (i = 0; i num_streams; i++) {
- DEBUG(10, (%s: stream: '%s'/%zd\n,
- __func__, streams[i].name, streams[i].size));
+ DEBUG(10, (%s: stream: '%s'/%ju\n,
+ __func__, streams[i].name,
+ (uintmax_t)streams[i].size));
src_fname_tmp = synthetic_smb_fname(
req,
--
Samba Shared Repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2015-07-14-0609/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2015-07-14-0609/samba.stderr http://git.samba.org/autobuild.flakey/2015-07-14-0609/samba.stdout The top commit at the time of the failure was: commit 893484602d39199a9533ebe0d656c79ecaa74406 Author: Volker Lendecke v...@samba.org Date: Sun Jul 12 10:59:38 2015 +0200 torture-notify: Give nonrecursive updates 200ms This is in line with the recursive updates before. Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org Autobuild-User(master): Volker Lendecke v...@samba.org Autobuild-Date(master): Mon Jul 13 15:00:26 CEST 2015 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8934846 torture-notify: Give nonrecursive updates 200ms from 40bcdb3 vfs_fruit: Fix the 32-bit build https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 893484602d39199a9533ebe0d656c79ecaa74406 Author: Volker Lendecke v...@samba.org Date: Sun Jul 12 10:59:38 2015 +0200 torture-notify: Give nonrecursive updates 200ms This is in line with the recursive updates before. Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Andrew Bartlett abart...@samba.org Autobuild-User(master): Volker Lendecke v...@samba.org Autobuild-Date(master): Mon Jul 13 15:00:26 CEST 2015 on sn-devel-104 --- Summary of changes: source4/torture/raw/notify.c | 1 + 1 file changed, 1 insertion(+) Changeset truncated at 500 lines: diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c index 9d837e7..fdb5771 100644 --- a/source4/torture/raw/notify.c +++ b/source4/torture/raw/notify.c @@ -440,6 +440,7 @@ static bool test_notify_recursive(struct torture_context *tctx, smbcli_rmdir(cli2-tree, BASEDIR \\subdir-name); smbcli_unlink(cli-tree, BASEDIR \\subname3-r); + smb_msleep(200); notify.nttrans.in.recursive = false; req2 = smb_raw_changenotify_send(cli-tree, notify); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 452e698 lib/util/charset: reduce loglevel for push_ucs2_talloc error
from 8934846 torture-notify: Give nonrecursive updates 200ms
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 452e698c4b6d1797657670472522ad522273ae6a
Author: Ralph Boehme s...@samba.org
Date: Mon Jul 13 12:51:46 2015 +0200
lib/util/charset: reduce loglevel for push_ucs2_talloc error
push_ucs2_talloc() may have failed because of EILSEQ, not a failing
malloc. Log the failure with DBG_WARNING instead of level 0.
Signed-off-by: Ralph Boehme s...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Tue Jul 14 03:59:05 CEST 2015 on sn-devel-104
---
Summary of changes:
lib/util/charset/util_str.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/charset/util_str.c b/lib/util/charset/util_str.c
index 33466ec..c1b81f1 100644
--- a/lib/util/charset/util_str.c
+++ b/lib/util/charset/util_str.c
@@ -545,13 +545,13 @@ char *strstr_m(const char *src, const char *findstr)
frame = talloc_stackframe();
if (!push_ucs2_talloc(frame, src_w, src, converted_size)) {
- DEBUG(0,(strstr_m: src malloc fail\n));
+ DBG_WARNING(strstr_m: src malloc fail\n);
TALLOC_FREE(frame);
return NULL;
}
if (!push_ucs2_talloc(frame, find_w, findstr, converted_size)) {
- DEBUG(0,(strstr_m: find malloc fail\n));
+ DBG_WARNING(strstr_m: find malloc fail\n);
TALLOC_FREE(frame);
return NULL;
}
--
Samba Shared Repository
