summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2017-04-19 13:12:55 +0200
committerKarolin Seeger <kseeger@samba.org>2017-04-28 09:12:27 +0200
commit30586d36be13507fb4f8fabb806b69035fc98096 (patch)
tree3f21070aaf6299be24a33973f6f87f523b3c9056 /source4
parent6ffea89a6d62f3a8684614c735b09f5a8043fa6b (diff)
downloadsamba-30586d36be13507fb4f8fabb806b69035fc98096.tar.gz
vfs_fruit: lp_case_sensitive() does not return a bool
lp_case_sensitive() returns an int, not a bool, so with the default setting of "Auto" by default we set the AAPL flag SMB2_CRTCTX_AAPL_CASE_SENSITIVE. This caused the client to believe the volume is case sensitive where it wasn't, leading to an error when trying to rename files changing only the case of the name. Also fix the existing torture test that verifies AAPL context negotiation and actually expected the server to return "case sensitive", while the Samba default is really "case insensitive". Bug: https://bugzilla.samba.org/show_bug.cgi?id=12749 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> (cherry picked from commit 36612723b2b18675116b6197183bdfe5e1d9e06f)
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/vfs/fruit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c
index 5182c00f914..bb8f36ea056 100644
--- a/source4/torture/vfs/fruit.c
+++ b/source4/torture/vfs/fruit.c
@@ -2068,9 +2068,9 @@ static bool test_aapl(struct torture_context *tctx,
}
aapl_vol_caps = BVAL(aapl->data.data, 24);
- if (aapl_vol_caps != SMB2_CRTCTX_AAPL_CASE_SENSITIVE) {
+ if (aapl_vol_caps != 0) {
/* this will fail on a case insensitive fs ... */
- torture_warning(tctx,
+ torture_result(tctx, TORTURE_FAIL,
"(%s) unexpected vol_caps: %d",
__location__, (int)aapl_vol_caps);
}