[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  d4c8b92 s3: Remove two false references to cli->inbuf (cherry picked from commit b1a7bdb93c7fda54a29284f1691de1dc4f3bbf6b)
       via  0f574d1 s3: Fix a leftover from fstring removal in cli_state
      from  318c77e Fix bug 8133 - strange behavior for the file (whose filename first character is period ) in SMB2 case.

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


- Log -----------------------------------------------------------------
commit d4c8b92a29aa9dcc976185aeb35ead8e911aab9c
Author: Volker Lendecke <vl at samba.org>
Date:   Mon May 23 12:21:17 2011 +0200

    s3: Remove two false references to cli->inbuf (cherry picked from commit b1a7bdb93c7fda54a29284f1691de1dc4f3bbf6b)
    
    Fix bug #8159 (Memory corruption in fetching cli->server_domain from the
    server.).

commit 0f574d1a2fbc1b043c96b103bda1b74b1088fd5b
Author: Volker Lendecke <vl at samba.org>
Date:   Mon May 23 15:36:20 2011 +0200

    s3: Fix a leftover from fstring removal in cli_state
    
    Jeremy, please check!
    (cherry picked from commit 9514f96856ccf822b683b5362fd2eb4a4e9e418a)

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

Summary of changes:
 source3/libsmb/cliconnect.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 828cb2c..97dd068 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -2655,11 +2655,14 @@ static void cli_negprot_done(struct tevent_req *subreq)
 		}
 		/* work out if they sent us a workgroup */
 		if (!(cli->capabilities & CAP_EXTENDED_SECURITY) &&
-		    smb_buflen(cli->inbuf) > 8) {
-			clistr_pull(cli->inbuf, cli->server_domain,
-				    bytes+8, sizeof(cli->server_domain),
-				    num_bytes-8,
-				    STR_UNICODE|STR_NOALIGN);
+		    smb_buflen(inbuf) > 8) {
+			ssize_t ret;
+			status = smb_bytes_talloc_string(
+				cli, (char *)inbuf, &cli->server_domain,
+				bytes + 8, num_bytes - 8, &ret);
+			if (tevent_req_nterror(req, status)) {
+				return;
+			}
 		}
 
 		/*


-- 
Samba Shared Repository