3 files changed, 11 insertions, 11 deletions
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 45c4e78cf10..7a568d3c9eb 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -653,9 +653,9 @@ static void dcerpc_bind_recv_handler(struct rpc_request *req,
   handle timeouts of individual dcerpc requests
 */
 static void dcerpc_timeout_handler(struct tevent_context *ev, struct tevent_timer *te, 
-				   struct timeval t, void *private)
+				   struct timeval t, void *private_data)
 {
-	struct rpc_request *req = talloc_get_type(private, struct rpc_request);
+	struct rpc_request *req = talloc_get_type(private_data, struct rpc_request);
 
 	if (req->ignore_timeout) {
 		dcerpc_req_dequeue(req);
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index 9b8503c04b9..0f9fbe0abc0 100644
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -709,9 +709,9 @@ static void continue_pipe_auth(struct composite_context *ctx)
   handle timeouts of a dcerpc connect
 */
 static void dcerpc_connect_timeout_handler(struct tevent_context *ev, struct tevent_timer *te, 
-					   struct timeval t, void *private)
+					   struct timeval t, void *private_data)
 {
-	struct composite_context *c = talloc_get_type(private, struct composite_context);
+	struct composite_context *c = talloc_get_type(private_data, struct composite_context);
 	composite_error(c, NT_STATUS_IO_TIMEOUT);
 }
 
diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c
index 689249288f6..64a5b92e90a 100644
--- a/source4/librpc/rpc/dcerpc_sock.c
+++ b/source4/librpc/rpc/dcerpc_sock.c
@@ -85,9 +85,9 @@ static void sock_dead(struct dcerpc_connection *p, NTSTATUS status)
 /*
   handle socket recv errors
 */
-static void sock_error_handler(void *private, NTSTATUS status)
+static void sock_error_handler(void *private_data, NTSTATUS status)
 {
-	struct dcerpc_connection *p = talloc_get_type(private, 
+	struct dcerpc_connection *p = talloc_get_type(private_data,
 						      struct dcerpc_connection);
 	sock_dead(p, status);
 }
@@ -95,7 +95,7 @@ static void sock_error_handler(void *private, NTSTATUS status)
 /*
   check if a blob is a complete packet
 */
-static NTSTATUS sock_complete_packet(void *private, DATA_BLOB blob, size_t *size)
+static NTSTATUS sock_complete_packet(void *private_data, DATA_BLOB blob, size_t *size)
 {
 	if (blob.length < DCERPC_FRAG_LEN_OFFSET+2) {
 		return STATUS_MORE_ENTRIES;
@@ -110,9 +110,9 @@ static NTSTATUS sock_complete_packet(void *private, DATA_BLOB blob, size_t *size
 /*
   process recv requests
 */
-static NTSTATUS sock_process_recv(void *private, DATA_BLOB blob)
+static NTSTATUS sock_process_recv(void *private_data, DATA_BLOB blob)
 {
-	struct dcerpc_connection *p = talloc_get_type(private, 
+	struct dcerpc_connection *p = talloc_get_type(private_data,
 						      struct dcerpc_connection);
 	struct sock_private *sock = (struct sock_private *)p->transport.private_data;
 	sock->pending_reads--;
@@ -127,9 +127,9 @@ static NTSTATUS sock_process_recv(void *private, DATA_BLOB blob)
   called when a IO is triggered by the events system
 */
 static void sock_io_handler(struct tevent_context *ev, struct tevent_fd *fde, 
-			    uint16_t flags, void *private)
+			    uint16_t flags, void *private_data)
 {
-	struct dcerpc_connection *p = talloc_get_type(private, 
+	struct dcerpc_connection *p = talloc_get_type(private_data,
 						      struct dcerpc_connection);
 	struct sock_private *sock = (struct sock_private *)p->transport.private_data;