From 6bc7746cedb16b8294714e69e241407826796bbd Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 23 May 2011 15:36:20 +0200 Subject: [PATCH 1/2] s3: Fix a leftover from fstring removal in cli_state Jeremy, please check! (cherry picked from commit 9514f96856ccf822b683b5362fd2eb4a4e9e418a) --- source3/libsmb/cliconnect.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 12380f5..e2c149c 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -2673,10 +2673,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; + } } /* -- 1.7.3.1