r11621: some minor fixes from comments by metze

(This used to be commit 6ab808223475ba7c52dbe4d639af9a8e7f64b202)

diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index a79dc8457e6f3d0cf507cf5a63e5a00509c2e773..e633b5baa732231e0fbdaea794866035e91e2183 100644 (file)
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -204,7 +204,8 @@ static void kdc_tcp_terminate_connection(struct kdc_tcp_connection *kdcconn, con
 */
 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 @@ nomem:
        status = NT_STATUS_NO_MEMORY;
 
 failed:
-       kdc_tcp_terminate_connection(kdcconn, nt_errstr(status));
-       return NT_STATUS_OK;
+       return status;
 }
 
 /*

diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index 6d2ffc0274a5900c7d40ef42e77e59722c291029..0ec15aea56a58a2c8d648e94d21717a9f18bdd96 100644 (file)
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -662,6 +662,10 @@ static void smbsrv_accept(struct stream_connection *conn)
        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);