svn commit: samba r4911 - in branches/SAMBA_4_0/source/libcli/composite: .

[tridge at samba.org]

Author: tridge
Date: 2005-01-21 22:01:57 +0000 (Fri, 21 Jan 2005)
New Revision: 4911

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4911

Log:
make sure we fill in the transport called name on port 445 as well
(thanks to abartlet for spotting this bug)








Modified:
   branches/SAMBA_4_0/source/libcli/composite/connect.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/composite/connect.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/composite/connect.c	2005-01-21 21:14:39 UTC (rev 4910)
+++ branches/SAMBA_4_0/source/libcli/composite/connect.c	2005-01-21 22:01:57 UTC (rev 4911)
@@ -219,19 +219,22 @@
 	state->transport = smbcli_transport_init(state->sock);
 	NT_STATUS_HAVE_NO_MEMORY(state->transport);
 
+	calling.name = io->in.calling_name;
+	calling.type = NBT_NAME_CLIENT;
+	calling.scope = NULL;
+
+	nbt_choose_called_name(state, &called, io->in.called_name, NBT_NAME_SERVER);
+
 	/* we have a connected socket - next step is a session
 	   request, if needed. Port 445 doesn't need it, so it goes
 	   straight to the negprot */
 	if (state->sock->port == 445) {
+		status = nbt_name_dup(state->transport, &called, 
+				      &state->transport->called);
+		NT_STATUS_NOT_OK_RETURN(status);
 		return connect_send_negprot(c, io);
 	}
 
-	calling.name = io->in.calling_name;
-	calling.type = NBT_NAME_CLIENT;
-	calling.scope = NULL;
-
-	nbt_choose_called_name(state, &called, io->in.called_name, NBT_NAME_SERVER);
-
 	state->req = smbcli_transport_connect_send(state->transport, &calling, &called);
 	NT_STATUS_HAVE_NO_MEMORY(state->req);