From b22364db4d1c711890a75dec8d23549f0c268bef Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 23 May 2011 15:36:20 +0200 Subject: [PATCH] s3: Fix a leftover from fstring removal in cli_state Jeremy, please check! (cherry picked from commit 9514f96856ccf822b683b5362fd2eb4a4e9e418a) (cherry picked from commit 0f574d1a2fbc1b043c96b103bda1b74b1088fd5b) --- source3/libsmb/cliconnect.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 828cb2c3792..9cebab734eb 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -2656,10 +2656,13 @@ 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); + ssize_t ret; + status = smb_bytes_talloc_string( + cli, (char *)cli->inbuf, &cli->server_domain, + bytes + 8, num_bytes - 8, &ret); + if (tevent_req_nterror(req, status)) { + return; + } } /* -- 2.11.4.GIT