git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
87e5e4f
)
s3: Fix a leftover from fstring removal in cli_state
author
Volker Lendecke
<vl@samba.org>
Mon, 23 May 2011 13:36:20 +0000
(15:36 +0200)
committer
Karolin Seeger
<kseeger@samba.org>
Tue, 7 Jun 2011 18:00:45 +0000
(20:00 +0200)
Jeremy, please check!
(cherry picked from commit
9514f96856ccf822b683b5362fd2eb4a4e9e418a
)
(cherry picked from commit
0f574d1a2fbc1b043c96b103bda1b74b1088fd5b
)
source3/libsmb/cliconnect.c
patch
|
blob
|
history
diff --git
a/source3/libsmb/cliconnect.c
b/source3/libsmb/cliconnect.c
index 828cb2c3792be79297ff202a0e09c7c8b1d43fa2..9cebab734eb8c4396db52428676b0380a119fcc2 100644
(file)
--- 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;
+ }
}
/*