1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-12 20:58:37 +03:00

r6979: Tidyups.

Jeremy.
(This used to be commit 619d0aeebba66624ea0f5c7cff1c637738275b84)
This commit is contained in:
Jeremy Allison 2005-05-25 20:31:46 +00:00 committed by Gerald (Jerry) Carter
parent 75f109bc81
commit 8f8ff6870c

View File

@ -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 ? */