sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Merge commit 'origin/v3-2-test' into my_branch

Browse Source
This commit is contained in:
Guenther Deschner 2007-10-11 02:43:29 +02:00
commit 52ca48f188
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/smbd/trans2.c
View File

@ -1469,7 +1469,7 @@ static BOOL get_lanman2_dir_entry(TALLOC_CTX *ctx,
p += fill_ea_buffer(ctx, p, space_remaining, conn, name_list); p += fill_ea_buffer(ctx, p, space_remaining, conn, name_list);
nameptr = p; nameptr = p;
len = srvstr_push(base_data, flags2, len = srvstr_push(base_data, flags2,
p + 1, fname, PTR_DIFF(end_data, p), p + 1, fname, PTR_DIFF(end_data, p+1),
STR_TERMINATE | STR_NOALIGN); STR_TERMINATE | STR_NOALIGN);
if (flags2 & FLAGS2_UNICODE_STRINGS) { if (flags2 & FLAGS2_UNICODE_STRINGS) {
if (len > 2) { if (len > 2) {
@ -1554,7 +1554,7 @@ static BOOL get_lanman2_dir_entry(TALLOC_CTX *ctx,
SOFF_T(p,0,allocation_size); p += 8; SOFF_T(p,0,allocation_size); p += 8;
SIVAL(p,0,nt_extmode); p += 4; SIVAL(p,0,nt_extmode); p += 4;
len = srvstr_push(base_data, flags2, len = srvstr_push(base_data, flags2,
p + 4, fname, PTR_DIFF(end_data, p), p + 4, fname, PTR_DIFF(end_data, p+4),
STR_TERMINATE_ASCII); STR_TERMINATE_ASCII);
SIVAL(p,0,len); SIVAL(p,0,len);
p += 4 + len; p += 4 + len;