summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2023-02-17 10:02:37 +0100
committerJule Anger <janger@samba.org>2023-04-11 16:30:25 +0000
commit31d4b337cb70203eac3032838a78c9c6ef48bf6e (patch)
treecf5bfdf7f25a503bcb160713838618146ec7c8d8
parentda3531910d7823bb46fbbb9ea5100d8b093a3cc0 (diff)
downloadsamba-31d4b337cb70203eac3032838a78c9c6ef48bf6e.tar.gz
smbd: Fix case normalization in for directories
Bug: https://bugzilla.samba.org/show_bug.cgi?id=15313 Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Volker Lendecke <vl@samba.org> Autobuild-Date(master): Fri Feb 24 08:46:14 UTC 2023 on atb-devel-224 (cherry picked from commit bf9130d375b6c401bb79fc1a0911975814759e3b) Autobuild-User(v4-18-test): Jule Anger <janger@samba.org> Autobuild-Date(v4-18-test): Tue Apr 11 16:30:25 UTC 2023 on atb-devel-224
-rw-r--r--selftest/knownfail.d/dircasesensitive1
-rw-r--r--source3/smbd/filename.c8
2 files changed, 8 insertions, 1 deletions
diff --git a/selftest/knownfail.d/dircasesensitive b/selftest/knownfail.d/dircasesensitive
deleted file mode 100644
index d2eae416772..00000000000
--- a/selftest/knownfail.d/dircasesensitive
+++ /dev/null
@@ -1 +0,0 @@
-^samba.tests.libsmb-basic.samba.tests.libsmb-basic.LibsmbTestCase.test_libsmb_TortureDirCaseSensitive.*
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 2c3d91a923c..98506775bce 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -1123,6 +1123,14 @@ static NTSTATUS filename_convert_dirfsp_nosymlink(
char *substitute = NULL;
size_t unparsed = 0;
+ status = normalize_filename_case(conn, dirname, ucf_flags);
+ if (!NT_STATUS_IS_OK(status)) {
+ DBG_ERR("normalize_filename_case %s failed: %s\n",
+ dirname,
+ nt_errstr(status));
+ goto fail;
+ }
+
status = openat_pathref_dirfsp_nosymlink(
mem_ctx,
conn,