From 384ce26f5bdf27aadaea967b17ee6ca8549aca5a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 21 Dec 2001 11:58:30 +0000 Subject: try to handle end of packet for not null terminated domain strings (This used to be commit 1da988456dbd885820093ae43c74e0ac66f72802) --- source3/libsmb/cliconnect.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/libsmb/cliconnect.c') diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index fc50e8e02f..d636e7e839 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -372,7 +372,9 @@ static DATA_BLOB cli_session_setup_blob(struct cli_state *cli, DATA_BLOB blob) p += blob2.length; p += clistr_pull(cli, cli->server_os, p, sizeof(fstring), -1, STR_TERMINATE); p += clistr_pull(cli, cli->server_type, p, sizeof(fstring), -1, STR_TERMINATE); - p += clistr_pull(cli, cli->server_domain, p, sizeof(fstring), -1, STR_TERMINATE); + p += clistr_pull(cli, cli->server_domain, p, sizeof(fstring), + smb_buflen(cli->inbuf) - PTR_DIFF(p, smb_buf(cli->inbuf)), + 0); return blob2; } -- cgit