[SCM] Samba Shared Repository branch, v3-2-test, updated. initial-v3-2-unstable-6-ge00ea35

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  e00ea359d66347a7c6f5d75de1670f788bfdc310 (commit)
       via  183df4754b5f18419f4d8fca2c0fa19919174556 (commit)
      from  be916777da8c681c393b817105e3dfe8a9c4ef12 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e00ea359d66347a7c6f5d75de1670f788bfdc310
Merge: 183df4754b5f18419f4d8fca2c0fa19919174556 be916777da8c681c393b817105e3dfe8a9c4ef12
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Oct 10 17:28:21 2007 -0700

    Merge branch 'v3-2-test' of git://git.samba.org/samba into SAMBA_3_2

commit 183df4754b5f18419f4d8fca2c0fa19919174556
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Oct 10 17:24:44 2007 -0700

    Fix valgrind-found memory overwrite.

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/trans2.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 7392271..ce038e7 100644
--- a/source/smbd/trans2.c
+++ b/source/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;


-- 
Samba Shared Repository