svn commit: samba r2655 - in branches/SAMBA_4_0/source/libcli/raw: .

[tridge at samba.org]

Author: tridge
Date: 2004-09-26 07:04:35 +0000 (Sun, 26 Sep 2004)
New Revision: 2655

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/libcli/raw&rev=2655&nolog=1

Log:
fixed an error in the shutdown of the sock->transport->session->tree
smbcli raw context handling

Modified:
   branches/SAMBA_4_0/source/libcli/raw/clisession.c
   branches/SAMBA_4_0/source/libcli/raw/clisocket.c
   branches/SAMBA_4_0/source/libcli/raw/clitransport.c
   branches/SAMBA_4_0/source/libcli/raw/clitree.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/clisession.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/clisession.c	2004-09-26 06:44:08 UTC (rev 2654)
+++ branches/SAMBA_4_0/source/libcli/raw/clisession.c	2004-09-26 07:04:35 UTC (rev 2655)
@@ -55,7 +55,6 @@
 	session->reference_count--;
 	if (session->reference_count <= 0) {
 		smbcli_transport_close(session->transport);
-		talloc_free(session);
 	}
 }
 

Modified: branches/SAMBA_4_0/source/libcli/raw/clisocket.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/clisocket.c	2004-09-26 06:44:08 UTC (rev 2654)
+++ branches/SAMBA_4_0/source/libcli/raw/clisocket.c	2004-09-26 07:04:35 UTC (rev 2655)
@@ -104,6 +104,7 @@
 	sock->reference_count--;
 	if (sock->reference_count <= 0) {
 		smbcli_sock_dead(sock);
+		talloc_free(sock);
 	}
 }
 

Modified: branches/SAMBA_4_0/source/libcli/raw/clitransport.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/clitransport.c	2004-09-26 06:44:08 UTC (rev 2654)
+++ branches/SAMBA_4_0/source/libcli/raw/clitransport.c	2004-09-26 07:04:35 UTC (rev 2655)
@@ -90,11 +90,10 @@
 {
 	transport->reference_count--;
 	if (transport->reference_count <= 0) {
-		smbcli_sock_close(transport->socket);
 		event_remove_fd(transport->event.ctx, transport->event.fde);
 		event_remove_timed(transport->event.ctx, transport->event.te);
 		event_context_destroy(transport->event.ctx);
-		talloc_free(transport);
+		smbcli_sock_close(transport->socket);
 	}
 }
 

Modified: branches/SAMBA_4_0/source/libcli/raw/clitree.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/clitree.c	2004-09-26 06:44:08 UTC (rev 2654)
+++ branches/SAMBA_4_0/source/libcli/raw/clitree.c	2004-09-26 07:04:35 UTC (rev 2655)
@@ -55,7 +55,6 @@
 	tree->reference_count--;
 	if (tree->reference_count <= 0) {
 		smbcli_session_close(tree->session);
-		talloc_free(tree);
 	}
 }
 
@@ -193,6 +192,8 @@
 		return NT_STATUS_NO_MEMORY;
 	}
 
+	talloc_set_name_const(sock, "smbcli_tree_full_connection");
+
 	/* open a TCP socket to the server */
 	if (!smbcli_sock_connect_byname(sock, dest_host, port)) {
 		DEBUG(2,("Failed to establish socket connection - %s\n", strerror(errno)));