[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  554b114... s3: Fix bug 7635
      from  af081ec... Fix bug 7627 - smbclient ignores "-I" when used with "-L", fails name resolution.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 554b1140a891d8b9a4a7be1eefae97b4e3a710ec
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Aug 21 11:32:58 2010 +0200

    s3: Fix bug 7635

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

Summary of changes:
 source3/libsmb/climessage.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/climessage.c b/source3/libsmb/climessage.c
index bdf2977..3777c41 100644
--- a/source3/libsmb/climessage.c
+++ b/source3/libsmb/climessage.c
@@ -63,8 +63,10 @@ static struct tevent_req *cli_message_start_send(TALLOC_CTX *mem_ctx,
 
 	*p++ = 4;
 	memcpy(p, utmp, ulen);
+	p += ulen;
 	*p++ = 4;
 	memcpy(p, htmp, hlen);
+	p += hlen;
 	TALLOC_FREE(htmp);
 	TALLOC_FREE(utmp);
 
@@ -165,8 +167,8 @@ static struct tevent_req *cli_message_text_send(TALLOC_CTX *mem_ctx,
 		TALLOC_FREE(tmp);
 		return tevent_req_post(req, ev);
 	}
-	SCVAL(bytes, 0, 0);	/* pad */
-	SSVAL(bytes, 1, msglen);
+	SCVAL(bytes, 0, 1);	/* pad */
+	SSVAL(bytes+1, 0, msglen);
 	memcpy(bytes+3, msg, msglen);
 	TALLOC_FREE(tmp);
 


-- 
Samba Shared Repository