summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-05-25 20:31:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:59 -0500
commit8f8ff6870ca7ac08fce778509e85b742c9438011 (patch)
tree26283fea3b002963b462e0c54bff01214c9aa707
parent75f109bc81c0ff0d714070b3f324bce62c2f3984 (diff)
downloadsamba-8f8ff6870ca7ac08fce778509e85b742c9438011.tar.gz
samba-8f8ff6870ca7ac08fce778509e85b742c9438011.tar.bz2
samba-8f8ff6870ca7ac08fce778509e85b742c9438011.zip
r6979: Tidyups.
Jeremy. (This used to be commit 619d0aeebba66624ea0f5c7cff1c637738275b84)
-rw-r--r--source3/smbd/trans2.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 8dedf30472..a0544c31b7 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1307,16 +1307,13 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
* a Win2k client bug. JRA.
*/
memset(p,'\0',26);
- if (!was_8_3 && lp_manglednames(SNUM(conn))) {
+ if (!was_8_3 && check_mangled_names) {
pstring mangled_name;
pstrcpy(mangled_name, fname);
mangle_map(mangled_name,True,True,SNUM(conn));
mangled_name[12] = 0;
len = srvstr_push(outbuf, p+2, mangled_name, 24, STR_UPPER|STR_UNICODE);
SSVAL(p, 0, len);
- } else {
- SSVAL(p,0,0);
- *(p+2) = 0;
}
p += 2 + 24;
len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE_ASCII);
@@ -1443,16 +1440,13 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
* a Win2k client bug. JRA.
*/
memset(p,'\0',26);
- if (!was_8_3 && lp_manglednames(SNUM(conn))) {
+ if (!was_8_3 && check_mangled_names) {
pstring mangled_name;
pstrcpy(mangled_name, fname);
mangle_map(mangled_name,True,True,SNUM(conn));
mangled_name[12] = 0;
len = srvstr_push(outbuf, p+2, mangled_name, 24, STR_UPPER|STR_UNICODE);
SSVAL(p, 0, len);
- } else {
- SSVAL(p,0,0);
- *(p+2) = 0;
}
p += 26;
SSVAL(p,0,0); p += 2; /* Reserved ? */