Attachment 6478 Details for Bug 8159 – Second git-am fix for 3.6.0.

[patch] Second git-am fix for 3.6.0.

0002-s3-Remove-two-false-references-to-cli-inbuf.patch (text/plain), 1.04 KB, created by Jeremy Allison on 2011-05-23 18:07:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2011-05-23 18:07:59 UTC

Size: 1.04 KB

patch

obsolete

>From b3a3f2b92d459d3f8c961d34e5fac1743b876b5d Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Mon, 23 May 2011 12:21:17 +0200
>Subject: [PATCH 2/2] s3: Remove two false references to cli->inbuf
> (cherry picked from commit b1a7bdb93c7fda54a29284f1691de1dc4f3bbf6b)
>
>---
> source3/libsmb/cliconnect.c |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
>index e2c149c..11062ef 100644
>--- a/source3/libsmb/cliconnect.c
>+++ b/source3/libsmb/cliconnect.c
>@@ -2672,10 +2672,10 @@ 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) {
>+		    smb_buflen(inbuf) > 8) {
> 			ssize_t ret;
> 			status = smb_bytes_talloc_string(
>-				cli, (char *)cli->inbuf, &cli->server_domain,
>+				cli, (char *)inbuf, &cli->server_domain,
> 				bytes + 8, num_bytes - 8, &ret);
> 			if (tevent_req_nterror(req, status)) {
> 				return;
>-- 
>1.7.3.1
>

Flags:

vl: review+

Actions: View

Attachments on bug 8159: 6477 | 6478