The branch, master has been updated
via 8d4cac1 s4:torture:vfs_fruit: fix model name check
via d9c22a3 vfs_fruit: fix base_fsp name conversion
from b817ce6 Add a script-only idmap module.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 8d4cac1245c3a9b29926be0a4a0daff0933b0260
Author: Ralph Boehme <[email protected]>
Date: Wed Jan 7 22:47:13 2015 +0100
s4:torture:vfs_fruit: fix model name check
Don't abort when the model string is not "Samba", simply log it.
Signed-off-by: Ralph Boehme <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Thu Jan 8 15:31:44 CET 2015 on sn-devel-104
commit d9c22a3af2ac319d075a952c71496b6b76c83fcf
Author: Volker Lendecke <[email protected]>
Date: Tue Jan 6 15:55:15 2015 +0000
vfs_fruit: fix base_fsp name conversion
Signed-off-by: Ralph Boehme <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_fruit.c | 2 +-
source4/torture/vfs/fruit.c | 8 +-------
2 files changed, 2 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index ecaddfb..e2d9b35 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -2877,7 +2877,7 @@ static int fruit_fstat(vfs_handle_struct *handle,
files_struct *fsp,
smb_fname_str_dbg(fsp->fsp_name)));
if (fsp->base_fsp) {
- tmp_base_name = fsp->fsp_name->base_name;
+ tmp_base_name = fsp->base_fsp->fsp_name->base_name;
/* fsp_name is not converted with vfs_catia */
status = SMB_VFS_TRANSLATE_NAME(
handle->conn,
diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c
index 5d4a411..162885e 100644
--- a/source4/torture/vfs/fruit.c
+++ b/source4/torture/vfs/fruit.c
@@ -1501,13 +1501,7 @@ static bool test_aapl(struct torture_context *tctx,
__location__);
goto done;
}
- if (strncmp(model, "Samba", 5) != 0) {
- torture_result(tctx, TORTURE_FAIL,
- "(%s) expected model \"Samba\", got: \"%s\"",
- __location__, model);
- ret = false;
- goto done;
- }
+ torture_comment(tctx, "Got server model: \"%s\"\n", model);
/*
* Now that Requested AAPL extensions are enabled, setup some
--
Samba Shared Repository
