From 133ed1cc6445bb6b734451a5eaf5939d5eb100b2 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 8 Mar 2011 16:10:07 +0100 Subject: [PATCH] s3-rpc_server: Change irritating debug message. --- source3/rpc_server/rpc_server.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c index 6f3d72d7562..974ecee0073 100644 --- a/source3/rpc_server/rpc_server.c +++ b/source3/rpc_server/rpc_server.c @@ -1215,7 +1215,6 @@ static void dcerpc_ncacn_packet_process(struct tevent_req *subreq) status = dcerpc_read_ncacn_packet_recv(subreq, ncacn_conn, &pkt, &recv_buffer); TALLOC_FREE(subreq); if (!NT_STATUS_IS_OK(status)) { - DEBUG(3, ("Failed to receive ncacn packet!\n")); goto fail; } @@ -1337,9 +1336,8 @@ static void dcerpc_ncacn_packet_process(struct tevent_req *subreq) return; fail: - DEBUG(2, ("Fatal error(%s). " - "Terminating client(%s) connection!\n", - nt_errstr(status), ncacn_conn->client_name)); + DEBUG(3, ("Terminating client(%s) connection! - '%s'\n", + ncacn_conn->client_name, nt_errstr(status))); /* Terminate client connection */ talloc_free(ncacn_conn); @@ -1350,6 +1348,7 @@ static void dcerpc_ncacn_packet_done(struct tevent_req *subreq) { struct dcerpc_ncacn_conn *ncacn_conn = tevent_req_callback_data(subreq, struct dcerpc_ncacn_conn); + NTSTATUS status = NT_STATUS_OK; int sys_errno; int rc; @@ -1357,6 +1356,7 @@ static void dcerpc_ncacn_packet_done(struct tevent_req *subreq) TALLOC_FREE(subreq); if (rc < 0) { DEBUG(2, ("Writev failed!\n")); + status = map_nt_error_from_unix(sys_errno); goto fail; } @@ -1373,7 +1373,7 @@ static void dcerpc_ncacn_packet_done(struct tevent_req *subreq) ncacn_conn->tstream); if (subreq == NULL) { DEBUG(2, ("Failed to start receving packets\n")); - sys_errno = ENOMEM; + status = NT_STATUS_NO_MEMORY; goto fail; } @@ -1381,8 +1381,8 @@ static void dcerpc_ncacn_packet_done(struct tevent_req *subreq) return; fail: - DEBUG(2, ("Fatal error(%s). Terminating client(%s) connection!\n", - strerror(sys_errno), ncacn_conn->client_name)); + DEBUG(3, ("Terminating client(%s) connection! - '%s'\n", + ncacn_conn->client_name, nt_errstr(status))); /* Terminate client connection */ talloc_free(ncacn_conn); -- 2.11.4.GIT