svn commit: samba r14673 - in branches/SAMBA_4_0/source/ldap_server: .

abartlet at samba.org abartlet at samba.org
Thu Mar 23 12:00:00 GMT 2006


Author: abartlet
Date: 2006-03-23 12:00:00 +0000 (Thu, 23 Mar 2006)
New Revision: 14673

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

Log:
Don't double-free conn, it is below 'c' free'ed by
stream_terminate_connection()

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/ldap_server/ldap_server.c


Changeset:
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_server.c
===================================================================
--- branches/SAMBA_4_0/source/ldap_server/ldap_server.c	2006-03-23 11:13:19 UTC (rev 14672)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_server.c	2006-03-23 12:00:00 UTC (rev 14673)
@@ -424,7 +424,6 @@
 		= cli_credentials_init(conn);
 	if (!server_credentials) {
 		stream_terminate_connection(c, "Failed to init server credentials\n");
-		talloc_free(conn);
 		return;
 	}
 	
@@ -432,7 +431,6 @@
 	status = cli_credentials_set_machine_account(server_credentials);
 	if (!NT_STATUS_IS_OK(status)) {
 		stream_terminate_connection(c, talloc_asprintf(conn, "Failed to obtain server credentials, perhaps a standalone server?: %s\n", nt_errstr(status)));
-		talloc_free(conn);
 		return;
 	}
 	conn->server_credentials = server_credentials;



More information about the samba-cvs mailing list