Merge branch 'master' of ssh://git.samba.org/data/git/samba

Conflicts:
	librpc/ndr.pc.in

4 files changed, 19 insertions, 19 deletions

diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 45c4e78cf1..7a568d3c9e 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 9b8503c04b..0f9fbe0abc 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_smb.c b/source4/librpc/rpc/dcerpc_smb.c
index 312a44a5f0..013a8578e6 100644
--- a/source4/librpc/rpc/dcerpc_smb.c
+++ b/source4/librpc/rpc/dcerpc_smb.c
@@ -84,7 +84,7 @@ static void smb_read_callback(struct smbcli_request *req)
 	uint16_t frag_length;
 	NTSTATUS status;
 
-	state = talloc_get_type(req->async.private, struct smb_read_state);
+	state = talloc_get_type(req->async.private_data, struct smb_read_state);
 	smb = talloc_get_type(state->c->transport.private_data, struct smb_private);
 	io = state->io;
 
@@ -133,7 +133,7 @@ static void smb_read_callback(struct smbcli_request *req)
 	}
 
 	state->req->async.fn = smb_read_callback;
-	state->req->async.private = state;
+	state->req->async.private_data = state;
 }
 
 /*
@@ -185,7 +185,7 @@ static NTSTATUS send_read_request_continue(struct dcerpc_connection *c, DATA_BLO
 	}
 
 	req->async.fn = smb_read_callback;
-	req->async.private = state;
+	req->async.private_data = state;
 
 	state->req = req;
 
@@ -221,7 +221,7 @@ struct smb_trans_state {
 */
 static void smb_trans_callback(struct smbcli_request *req)
 {
-	struct smb_trans_state *state = (struct smb_trans_state *)req->async.private;
+	struct smb_trans_state *state = (struct smb_trans_state *)req->async.private_data;
 	struct dcerpc_connection *c = state->c;
 	NTSTATUS status;
 
@@ -293,7 +293,7 @@ static NTSTATUS smb_send_trans_request(struct dcerpc_connection *c, DATA_BLOB *b
 	}
 
 	state->req->async.fn = smb_trans_callback;
-	state->req->async.private = state;
+	state->req->async.private_data = state;
 
 	talloc_steal(state, state->req);
 
@@ -305,7 +305,7 @@ static NTSTATUS smb_send_trans_request(struct dcerpc_connection *c, DATA_BLOB *b
 */
 static void smb_write_callback(struct smbcli_request *req)
 {
-	struct dcerpc_connection *c = (struct dcerpc_connection *)req->async.private;
+	struct dcerpc_connection *c = (struct dcerpc_connection *)req->async.private_data;
 
 	if (!NT_STATUS_IS_OK(req->status)) {
 		DEBUG(0,("dcerpc_smb: write callback error\n"));
@@ -351,7 +351,7 @@ static NTSTATUS smb_send_request(struct dcerpc_connection *c, DATA_BLOB *blob,
 	}
 
 	req->async.fn = smb_write_callback;
-	req->async.private = c;
+	req->async.private_data = c;
 
 	if (trigger_read) {
 		send_read_request(c);
@@ -501,7 +501,7 @@ struct composite_context *dcerpc_pipe_open_smb_send(struct dcerpc_pipe *p,
 
 static void pipe_open_recv(struct smbcli_request *req)
 {
-	struct pipe_open_smb_state *state = talloc_get_type(req->async.private,
+	struct pipe_open_smb_state *state = talloc_get_type(req->async.private_data,
 					    struct pipe_open_smb_state);
 	struct composite_context *ctx = state->ctx;
 	struct dcerpc_connection *c = state->c;
diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c
index 689249288f..64a5b92e90 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;