summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-04-12 00:00:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:35 -0500
commitc044df57dd78c4c17995913739fb8db6b42928a6 (patch)
treea1e46f69ae93ad2ef0110bb77cc57bebed14b25e /source3
parente1ff2af9dcf8067e3ed7fbf1d4aafa1cc129c6a6 (diff)
downloadsamba-c044df57dd78c4c17995913739fb8db6b42928a6.tar.gz
samba-c044df57dd78c4c17995913739fb8db6b42928a6.tar.bz2
samba-c044df57dd78c4c17995913739fb8db6b42928a6.zip
r6302: OS/2 fix from Marcel Müller <mueller@maazl.de>. Don't check for mangled names
if mangled names is off. Jeremy. (This used to be commit b2330c38881baceaafe1ef6b7ce00d1b5cd8d5c7)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/trans2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 4fda95d6c0..dd72db2fae 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1019,6 +1019,7 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
BOOL was_8_3;
int nt_extmode; /* Used for NT connections instead of mode */
BOOL needslash = ( conn->dirpath[strlen(conn->dirpath) -1] != '/');
+ BOOL check_mangled_names = lp_manglednames(SNUM(conn));
*fname = 0;
*out_of_space = False;
@@ -1063,7 +1064,7 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
if(!(got_match = *got_exact_match = exact_match(fname, mask, conn->case_sensitive)))
got_match = mask_match(fname, mask, conn->case_sensitive);
- if(!got_match && !mangle_is_8_3(fname, False)) {
+ if(!got_match && check_mangled_names && !mangle_is_8_3(fname, False)) {
/*
* It turns out that NT matches wildcards against