summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGuenther Deschner <gd@samba.org>2007-10-11 02:43:29 +0200
committerGuenther Deschner <gd@samba.org>2007-10-11 02:43:29 +0200
commite1222ec7ea41091ca2eb51867a940cbbadad9514 (patch)
tree8d46d9202f5640c754ea232311959c0694affb5c /source3
parent31152a498191f2dba07d730ed176fc59e8bd48ca (diff)
parentd588123885b8c90f2fea4e0c2e35fee9db5231a6 (diff)
downloadsamba-e1222ec7ea41091ca2eb51867a940cbbadad9514.tar.gz
samba-e1222ec7ea41091ca2eb51867a940cbbadad9514.tar.bz2
samba-e1222ec7ea41091ca2eb51867a940cbbadad9514.zip
Merge commit 'origin/v3-2-test' into my_branch
(This used to be commit 52ca48f1881fc7b6ac9d1252468bb20eee174407)
Diffstat (limited to 'source3')
-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 7392271b48..ce038e719a 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1469,7 +1469,7 @@ static BOOL get_lanman2_dir_entry(TALLOC_CTX *ctx,
p += fill_ea_buffer(ctx, p, space_remaining, conn, name_list);
nameptr = p;
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);
if (flags2 & FLAGS2_UNICODE_STRINGS) {
if (len > 2) {
@@ -1554,7 +1554,7 @@ static BOOL get_lanman2_dir_entry(TALLOC_CTX *ctx,
SOFF_T(p,0,allocation_size); p += 8;
SIVAL(p,0,nt_extmode); p += 4;
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);
SIVAL(p,0,len);
p += 4 + len;