From 9a9a38c666a8285fdfac35758aa85f5d33ba6e95 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Mon, 2 Aug 2010 10:14:02 -0400 Subject: Change debug statements to use __location__ --- source3/rpc_client/cli_pipe.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 0c1b570249..4ad442edaa 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -455,16 +455,15 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx, break; case DCERPC_PKT_BIND_NAK: - DEBUG(1, ("cli_pipe_validate_current_pdu: Bind NACK " - "received from %s!\n", + DEBUG(1, (__location__ ": Bind NACK received from %s!\n", rpccli_pipe_txt(talloc_tos(), cli))); /* Use this for now... */ return NT_STATUS_NETWORK_ACCESS_DENIED; case DCERPC_PKT_FAULT: - DEBUG(1, ("cli_pipe_validate_current_pdu: RPC fault " - "code %s received from %s!\n", + DEBUG(1, (__location__ ": RPC fault code %s received " + "from %s!\n", dcerpc_errstr(talloc_tos(), pkt->u.fault.status), rpccli_pipe_txt(talloc_tos(), cli))); @@ -476,18 +475,18 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx, } default: - DEBUG(0, ("Unknown packet type %u received from %s!\n", + DEBUG(0, (__location__ "Unknown packet type %u received " + "from %s!\n", (unsigned int)pkt->ptype, rpccli_pipe_txt(talloc_tos(), cli))); return NT_STATUS_INVALID_INFO_CLASS; } if (pkt->ptype != expected_pkt_type) { - DEBUG(3, ("cli_pipe_validate_current_pdu: Connection to %s " - "got an unexpected RPC packet type - %u, not %u\n", + DEBUG(3, (__location__ ": Connection to %s got an unexpected " + "RPC packet type - %u, not %u\n", rpccli_pipe_txt(talloc_tos(), cli), - pkt->ptype, - expected_pkt_type)); + pkt->ptype, expected_pkt_type)); return NT_STATUS_INVALID_INFO_CLASS; } @@ -497,10 +496,9 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX *mem_ctx, if ((pkt->ptype == DCERPC_PKT_BIND_ACK) && !(pkt->pfc_flags & DCERPC_PFC_FLAG_LAST)) { - DEBUG(5, ("cli_pipe_validate_current_pdu: bug in server " - "(AS/U?), setting fragment first/last ON.\n")); - pkt->pfc_flags |= DCERPC_PFC_FLAG_FIRST | - DCERPC_PFC_FLAG_LAST; + DEBUG(5, (__location__ ": bug in server (AS/U?), setting " + "fragment first/last ON.\n")); + pkt->pfc_flags |= DCERPC_PFC_FLAG_FIRST | DCERPC_PFC_FLAG_LAST; } return NT_STATUS_OK; -- cgit