summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-03-12 20:24:05 +0000
committerJeremy Allison <jra@samba.org>2004-03-12 20:24:05 +0000
commit95fee5e3bf509eee1a546ebdd23f6bdfd0cf7a20 (patch)
treeb86e3f268a3b87fadff82032c5de0bd569a51f38
parent6011a89e240ba8a51163baee51da98d2b32ab98c (diff)
downloadsamba-95fee5e3bf509eee1a546ebdd23f6bdfd0cf7a20.tar.gz
samba-95fee5e3bf509eee1a546ebdd23f6bdfd0cf7a20.tar.bz2
samba-95fee5e3bf509eee1a546ebdd23f6bdfd0cf7a20.zip
Fix from Robert.Dahlem@gmx.net (Robert Dahlem) for bugid #1048
when mangled names are turned off. Jeremy. (This used to be commit 29909ce26ac9a0d8e631b1ed884c525674ee5606)
-rw-r--r--source3/smbd/trans2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 19269cbc6c..2f164dafa2 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -684,7 +684,7 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
* a Win2k client bug. JRA.
*/
memset(p,'\0',26);
- if (!was_8_3) {
+ if (!was_8_3 && lp_manglednames(SNUM(conn))) {
pstring mangled_name;
pstrcpy(mangled_name, fname);
mangle_map(mangled_name,True,True,SNUM(conn));
@@ -806,7 +806,7 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
* a Win2k client bug. JRA.
*/
memset(p,'\0',26);
- if (!was_8_3) {
+ if (!was_8_3 && lp_manglednames(SNUM(conn))) {
pstring mangled_name;
pstrcpy(mangled_name, fname);
mangle_map(mangled_name,True,True,SNUM(conn));