diff options
| author | Volker Lendecke <vl@samba.org> | 2011-05-23 15:36:20 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2011-05-23 15:45:36 +0200 |
| commit | 9514f96856ccf822b683b5362fd2eb4a4e9e418a (patch) | |
| tree | bab365c8f6ecc9d59d5d4d89a2636e982965a928 | |
| parent | 8167e840738febd3fad47094f3e948545c6f0677 (diff) | |
| download | samba-9514f96856ccf822b683b5362fd2eb4a4e9e418a.tar.gz samba-9514f96856ccf822b683b5362fd2eb4a4e9e418a.tar.bz2 samba-9514f96856ccf822b683b5362fd2eb4a4e9e418a.zip | |
s3: Fix a leftover from fstring removal in cli_state
Jeremy, please check!
| -rw-r--r-- | 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 69d5ce6247..8d3fec36ec 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -2647,10 +2647,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; + } } /* |