diff options
| author | Jeremy Allison <jra@samba.org> | 2008-11-11 10:20:24 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-11-11 10:20:24 -0800 |
| commit | 4f2635b729e636e123afacb0970c3d49343b3e90 (patch) | |
| tree | 76d632982f23f08b23593af78614e9414dbbac2c /source3/libsmb/cliconnect.c | |
| parent | 8cb23a6b2950d7419767845b6097470f76f348a7 (diff) | |
| parent | 2e6bf03e519e180a1ee672dc9c9171d9e0cd114f (diff) | |
| download | samba-4f2635b729e636e123afacb0970c3d49343b3e90.tar.gz samba-4f2635b729e636e123afacb0970c3d49343b3e90.tar.bz2 samba-4f2635b729e636e123afacb0970c3d49343b3e90.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source3/libsmb/cliconnect.c')
| -rw-r--r-- | source3/libsmb/cliconnect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 6b4798e492..1588ae3efe 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -516,7 +516,7 @@ static DATA_BLOB cli_session_setup_blob_receive(struct cli_state *cli) p += clistr_pull(cli, cli->server_os, p, sizeof(fstring), -1, STR_TERMINATE); /* w2k with kerberos doesn't properly null terminate this field */ - len = smb_buflen(cli->inbuf) - PTR_DIFF(p, smb_buf(cli->inbuf)); + len = smb_bufrem(cli->inbuf, p); p += clistr_pull(cli, cli->server_type, p, sizeof(fstring), len, 0); return blob2; |