summaryrefslogtreecommitdiff
path: root/source3/smbd/trans2.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-06-13 19:29:02 +0000
committerJeremy Allison <jra@samba.org>2002-06-13 19:29:02 +0000
commit5d452f0d000ba15c2a837db8750472e5f2c93ce0 (patch)
treeaf320bfa39ae3cf1e1e8ce1dbf81875bf7799df9 /source3/smbd/trans2.c
parentbad738e6536e983064eee7647229354bc9028183 (diff)
downloadsamba-5d452f0d000ba15c2a837db8750472e5f2c93ce0.tar.gz
samba-5d452f0d000ba15c2a837db8750472e5f2c93ce0.tar.bz2
samba-5d452f0d000ba15c2a837db8750472e5f2c93ce0.zip
Merge in mangle fixes from 2.2.
Jeremy. (This used to be commit 5e2571f424a40df4d67fe279517a9b21184b78e1)
Diffstat (limited to 'source3/smbd/trans2.c')
-rw-r--r--source3/smbd/trans2.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index d5c445c5f3..efb0864a11 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1666,8 +1666,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn,
pstrcpy(short_name,base_name);
/* Mangle if not already 8.3 */
if(!mangle_is_8_3(short_name, True)) {
- if(!mangle_map(short_name,True,True,SNUM(conn)))
- *short_name = '\0';
+ mangle_map(short_name,True,True,SNUM(conn));
}
len = srvstr_push(outbuf, pdata+4, short_name, -1, STR_TERMINATE|STR_UPPER);
data_size = 4 + len;