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

Conflicts:
	librpc/ndr.pc.in

5 files changed, 32 insertions, 32 deletions

diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c
index 4077ae97e6..d20175a018 100644
--- a/source4/torture/raw/lockbench.c
+++ b/source4/torture/raw/lockbench.c
@@ -112,7 +112,7 @@ static void lock_send(struct benchlock_state *state)
 		DEBUG(0,("Failed to setup lock\n"));
 		lock_failed++;
 	}
-	state->req->async.private = state;
+	state->req->async.private_data = state;
 	state->req->async.fn      = lock_completion;
 }
 
@@ -222,7 +222,7 @@ static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te
 */
 static void lock_completion(struct smbcli_request *req)
 {
-	struct benchlock_state *state = (struct benchlock_state *)req->async.private;
+	struct benchlock_state *state = (struct benchlock_state *)req->async.private_data;
 	NTSTATUS status = smbcli_request_simple_recv(req);
 	state->req = NULL;
 	if (!NT_STATUS_IS_OK(status)) {
@@ -262,7 +262,7 @@ static void lock_completion(struct smbcli_request *req)
 
 static void echo_completion(struct smbcli_request *req)
 {
-	struct benchlock_state *state = (struct benchlock_state *)req->async.private;
+	struct benchlock_state *state = (struct benchlock_state *)req->async.private_data;
 	NTSTATUS status = smbcli_request_simple_recv(req);
 	if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) ||
 	    NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT)) {
@@ -305,7 +305,7 @@ static void report_rate(struct tevent_context *ev, struct tevent_timer *te,
 		p.in.size = 0;
 		p.in.data = NULL;
 		req = smb_raw_echo_send(state[i].tree->session->transport, &p);
-		req->async.private = &state[i];
+		req->async.private_data = &state[i];
 		req->async.fn      = echo_completion;
 	}
 }
diff --git a/source4/torture/raw/offline.c b/source4/torture/raw/offline.c
index 2d97efa049..5322f471a2 100644
--- a/source4/torture/raw/offline.c
+++ b/source4/torture/raw/offline.c
@@ -159,7 +159,7 @@ static void savefile_callback(struct composite_context *ctx)
  */
 static void setoffline_callback(struct smbcli_request *req) 
 {
-	struct offline_state *state = req->async.private;
+	struct offline_state *state = req->async.private_data;
 	NTSTATUS status;
 
 	status = smbcli_request_simple_recv(req);
@@ -183,7 +183,7 @@ static void setoffline_callback(struct smbcli_request *req)
  */
 static void getoffline_callback(struct smbcli_request *req) 
 {
-	struct offline_state *state = req->async.private;
+	struct offline_state *state = req->async.private_data;
 	NTSTATUS status;
 	union smb_fileinfo io;
 
@@ -286,7 +286,7 @@ static void test_offline(struct offline_state *state)
 		}
 		
 		state->req->async.fn = setoffline_callback;
-		state->req->async.private = state;
+		state->req->async.private_data = state;
 		break;
 	}
 
@@ -303,7 +303,7 @@ static void test_offline(struct offline_state *state)
 		}
 		
 		state->req->async.fn = getoffline_callback;
-		state->req->async.private = state;
+		state->req->async.private_data = state;
 		break;
 	}
 
@@ -318,7 +318,7 @@ static void test_offline(struct offline_state *state)
 
 static void echo_completion(struct smbcli_request *req)
 {
-	struct offline_state *state = (struct offline_state *)req->async.private;
+	struct offline_state *state = (struct offline_state *)req->async.private_data;
 	NTSTATUS status = smbcli_request_simple_recv(req);
 	if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) ||
 	    NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT)) {
@@ -380,7 +380,7 @@ static void report_rate(struct tevent_context *ev, struct tevent_timer *te,
 		p.in.size = 0;
 		p.in.data = NULL;
 		req = smb_raw_echo_send(state[i].tree->session->transport, &p);
-		req->async.private = &state[i];
+		req->async.private_data = &state[i];
 		req->async.fn      = echo_completion;
 	}
 }
diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c
index a9ce4aec0d..bdad2b16a5 100644
--- a/source4/torture/raw/openbench.c
+++ b/source4/torture/raw/openbench.c
@@ -186,7 +186,7 @@ static void next_open(struct benchopen_state *state)
 
 	state->req_open = smb_raw_open_send(state->tree, &state->open_parms);
 	state->req_open->async.fn = open_completed;
-	state->req_open->async.private = state;
+	state->req_open->async.private_data = state;
 }
 
 
@@ -203,7 +203,7 @@ static void next_close(struct benchopen_state *state)
 
 	state->req_close = smb_raw_close_send(state->tree, &state->close_parms);
 	state->req_close->async.fn = close_completed;
-	state->req_close->async.private = state;
+	state->req_close->async.private_data = state;
 }
 
 /*
@@ -211,7 +211,7 @@ static void next_close(struct benchopen_state *state)
 */
 static void open_completed(struct smbcli_request *req)
 {
-	struct benchopen_state *state = (struct benchopen_state *)req->async.private;
+	struct benchopen_state *state = (struct benchopen_state *)req->async.private_data;
 	TALLOC_CTX *tmp_ctx = talloc_new(state->mem_ctx);
 	NTSTATUS status;
 
@@ -243,7 +243,7 @@ static void open_completed(struct smbcli_request *req)
 		state->open_retries++;
 		state->req_open = smb_raw_open_send(state->tree, &state->open_parms);
 		state->req_open->async.fn = open_completed;
-		state->req_open->async.private = state;
+		state->req_open->async.private_data = state;
 		return;
 	}
 
@@ -275,7 +275,7 @@ static void open_completed(struct smbcli_request *req)
 */
 static void close_completed(struct smbcli_request *req)
 {
-	struct benchopen_state *state = (struct benchopen_state *)req->async.private;
+	struct benchopen_state *state = (struct benchopen_state *)req->async.private_data;
 	NTSTATUS status = smbcli_request_simple_recv(req);
 
 	state->req_close = NULL;
@@ -312,7 +312,7 @@ static void close_completed(struct smbcli_request *req)
 
 static void echo_completion(struct smbcli_request *req)
 {
-	struct benchopen_state *state = (struct benchopen_state *)req->async.private;
+	struct benchopen_state *state = (struct benchopen_state *)req->async.private_data;
 	NTSTATUS status = smbcli_request_simple_recv(req);
 	if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) ||
 	    NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT)) {
@@ -357,7 +357,7 @@ static void report_rate(struct tevent_context *ev, struct tevent_timer *te,
 		p.in.size = 0;
 		p.in.data = NULL;
 		req = smb_raw_echo_send(state[i].tree->session->transport, &p);
-		req->async.private = &state[i];
+		req->async.private_data = &state[i];
 		req->async.fn      = echo_completion;
 	}
 }
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index d31d841e13..c10c49ecf3 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -74,9 +74,9 @@ static struct {
 */
 static bool oplock_handler_ack_to_given(struct smbcli_transport *transport,
 					uint16_t tid, uint16_t fnum,
-					uint8_t level, void *private)
+					uint8_t level, void *private_data)
 {
-	struct smbcli_tree *tree = (struct smbcli_tree *)private;
+	struct smbcli_tree *tree = (struct smbcli_tree *)private_data;
 	const char *name;
 
 	break_info.fnum = fnum;
@@ -105,9 +105,9 @@ static bool oplock_handler_ack_to_given(struct smbcli_transport *transport,
 */
 static bool oplock_handler_ack_to_none(struct smbcli_transport *transport, 
 				       uint16_t tid, uint16_t fnum, 
-				       uint8_t level, void *private)
+				       uint8_t level, void *private_data)
 {
-	struct smbcli_tree *tree = (struct smbcli_tree *)private;
+	struct smbcli_tree *tree = (struct smbcli_tree *)private_data;
 	break_info.fnum = fnum;
 	break_info.level = level;
 	break_info.count++;
@@ -122,7 +122,7 @@ static bool oplock_handler_ack_to_none(struct smbcli_transport *transport,
 */
 static bool oplock_handler_timeout(struct smbcli_transport *transport,
 				   uint16_t tid, uint16_t fnum,
-				   uint8_t level, void *private)
+				   uint8_t level, void *private_data)
 {
 	break_info.fnum = fnum;
 	break_info.level = level;
@@ -146,10 +146,10 @@ static void oplock_handler_close_recv(struct smbcli_request *req)
   a handler function for oplock break requests - close the file
 */
 static bool oplock_handler_close(struct smbcli_transport *transport, uint16_t tid, 
-				 uint16_t fnum, uint8_t level, void *private)
+				 uint16_t fnum, uint8_t level, void *private_data)
 {
 	union smb_close io;
-	struct smbcli_tree *tree = (struct smbcli_tree *)private;
+	struct smbcli_tree *tree = (struct smbcli_tree *)private_data;
 	struct smbcli_request *req;
 
 	break_info.fnum = fnum;
@@ -166,7 +166,7 @@ static bool oplock_handler_close(struct smbcli_transport *transport, uint16_t ti
 	}
 
 	req->async.fn = oplock_handler_close_recv;
-	req->async.private = NULL;
+	req->async.private_data = NULL;
 
 	return true;
 }
@@ -2999,9 +2999,9 @@ static struct hold_oplock_info {
 
 static bool oplock_handler_hold(struct smbcli_transport *transport, 
 				uint16_t tid, uint16_t fnum, uint8_t level, 
-				void *private)
+				void *private_data)
 {
-	struct smbcli_tree *tree = (struct smbcli_tree *)private;
+	struct smbcli_tree *tree = (struct smbcli_tree *)private_data;
 	struct hold_oplock_info *info;
 	int i;
 
@@ -3019,7 +3019,7 @@ static bool oplock_handler_hold(struct smbcli_transport *transport,
 	if (info->close_on_break) {
 		printf("oplock break on %s - closing\n",
 		       info->fname);
-		oplock_handler_close(transport, tid, fnum, level, private);
+		oplock_handler_close(transport, tid, fnum, level, private_data);
 		return true;
 	}
 
diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c
index 2a6aef20b5..8a3168dcc4 100644
--- a/source4/torture/raw/search.c
+++ b/source4/torture/raw/search.c
@@ -31,9 +31,9 @@
 /*
   callback function for single_search
 */
-static bool single_search_callback(void *private, const union smb_search_data *file)
+static bool single_search_callback(void *private_data, const union smb_search_data *file)
 {
-	union smb_search_data *data = (union smb_search_data *)private;
+	union smb_search_data *data = (union smb_search_data *)private_data;
 
 	*data = *file;
 
@@ -510,9 +510,9 @@ struct multiple_result {
 /*
   callback function for multiple_search
 */
-static bool multiple_search_callback(void *private, const union smb_search_data *file)
+static bool multiple_search_callback(void *private_data, const union smb_search_data *file)
 {
-	struct multiple_result *data = (struct multiple_result *)private;
+	struct multiple_result *data = (struct multiple_result *)private_data;
 
 
 	data->count++;