Fix bug #6419 - smbclient -L 127.0.0.1" displays "netbios name" instead of "workgroup"

Unify the handling of the sessionsetup parsing so we don't get different
results when parsing a guest reply than an ntlmssp reply.
Jeremy.

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 16c15ce7db96505f3eef1cea76b3475489ae426f..772661103bb93c017a3d1e5213044ae136d5c427 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -671,9 +671,30 @@ static DATA_BLOB cli_session_setup_blob_receive(struct cli_state *cli)
 
        /* w2k with kerberos doesn't properly null terminate this field */
        len = smb_bufrem(cli->inbuf, p);
-       p += clistr_pull(cli->inbuf, cli->server_type, p, sizeof(fstring),
-                        len, 0);
+       if (p + len < cli->inbuf + cli->bufsize+SAFETY_MARGIN - 2) {
+               char *end_of_buf = p + len;
 
+               SSVAL(p, len, 0);
+               /* Now it's null terminated. */
+               p += clistr_pull(cli->inbuf, cli->server_type, p, sizeof(fstring),
+                       -1, STR_TERMINATE);
+               /*
+                * See if there's another string. If so it's the
+                * server domain (part of the 'standard' Samba
+                * server signature).
+                */
+               if (p < end_of_buf) {
+                       p += clistr_pull(cli->inbuf, cli->server_domain, p, sizeof(fstring),
+                               -1, STR_TERMINATE);
+               }
+       } else {
+               /*
+                * No room to null terminate so we can't see if there
+                * is another string (server_domain) afterwards.
+                */
+               p += clistr_pull(cli->inbuf, cli->server_type, p, sizeof(fstring),
+                                len, 0);
+       }
        return blob2;
 }
 
@@ -918,7 +939,9 @@ static NTSTATUS cli_session_setup_ntlmssp(struct cli_state *cli, const char *use
 
        if (NT_STATUS_IS_OK(nt_status)) {
 
-               fstrcpy(cli->server_domain, ntlmssp_state->server_domain);
+               if (cli->server_domain[0] == '\0') {
+                       fstrcpy(cli->server_domain, ntlmssp_state->server_domain);
+               }
                cli_set_session_key(cli, ntlmssp_state->session_key);
 
                if (cli_simple_set_signing(