svn commit: samba r11621 - in branches/SAMBA_4_0/source: kdc smb_server

[tridge at samba.org]

Author: tridge
Date: 2005-11-10 00:36:53 +0000 (Thu, 10 Nov 2005)
New Revision: 11621

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

Log:

some minor fixes from comments by metze






Modified:
   branches/SAMBA_4_0/source/kdc/kdc.c
   branches/SAMBA_4_0/source/smb_server/smb_server.c


Changeset:
Modified: branches/SAMBA_4_0/source/kdc/kdc.c
===================================================================
--- branches/SAMBA_4_0/source/kdc/kdc.c	2005-11-10 00:28:02 UTC (rev 11620)
+++ branches/SAMBA_4_0/source/kdc/kdc.c	2005-11-10 00:36:53 UTC (rev 11621)
@@ -204,7 +204,8 @@
 */
 static NTSTATUS kdc_tcp_recv(void *private, DATA_BLOB blob)
 {
-	struct kdc_tcp_connection *kdcconn = talloc_get_type(private, struct kdc_tcp_connection);
+	struct kdc_tcp_connection *kdcconn = talloc_get_type(private, 
+							     struct kdc_tcp_connection);
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 	TALLOC_CTX *tmp_ctx = talloc_new(kdcconn);
 	const char *src_addr;
@@ -255,8 +256,7 @@
 	status = NT_STATUS_NO_MEMORY;
 
 failed:
-	kdc_tcp_terminate_connection(kdcconn, nt_errstr(status));
-	return NT_STATUS_OK;
+	return status;
 }
 
 /*

Modified: branches/SAMBA_4_0/source/smb_server/smb_server.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb_server.c	2005-11-10 00:28:02 UTC (rev 11620)
+++ branches/SAMBA_4_0/source/smb_server/smb_server.c	2005-11-10 00:36:53 UTC (rev 11621)
@@ -662,6 +662,10 @@
 	smb_conn->negotiate.calling_name = NULL;
 
 	smb_conn->packet = packet_init(smb_conn);
+	if (smb_conn->packet == NULL) {
+		stream_terminate_connection(conn, "out of memory");
+		return;
+	}
 	packet_set_private(smb_conn->packet, smb_conn);
 	packet_set_socket(smb_conn->packet, conn->socket);
 	packet_set_callback(smb_conn->packet, receive_smb_request);