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

Conflicts:
	librpc/ndr.pc.in

3 files changed, 12 insertions, 12 deletions

diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index c79fa8c753..2a2bfbb13b 100644
--- a/source4/web_server/web_server.c
+++ b/source4/web_server/web_server.c
@@ -50,9 +50,9 @@ static int websrv_destructor(struct websrv_context *web)
 */
 static void websrv_timeout(struct tevent_context *event_context, 
 			   struct tevent_timer *te, 
-			   struct timeval t, void *private)
+			   struct timeval t, void *private_data)
 {
-	struct websrv_context *web = talloc_get_type(private, struct websrv_context);
+	struct websrv_context *web = talloc_get_type(private_data, struct websrv_context);
 	struct stream_connection *conn = web->conn;
 	web->conn = NULL;
 	/* TODO: send a message to any running esp context on this connection
@@ -145,7 +145,7 @@ NTSTATUS http_parse_header(struct websrv_context *web, const char *line)
 static void websrv_recv(struct stream_connection *conn, uint16_t flags)
 {
 	struct web_server_data *wdata;
-	struct websrv_context *web = talloc_get_type(conn->private, 
+	struct websrv_context *web = talloc_get_type(conn->private_data,
 						     struct websrv_context);
 	NTSTATUS status;
 	uint8_t buf[1024];
@@ -202,7 +202,7 @@ static void websrv_recv(struct stream_connection *conn, uint16_t flags)
 		 destroy the stack variables being used by that
 		 rendering process when we handle the timeout. */
 		if (!talloc_reference(web->task, web)) goto failed;
-		wdata = talloc_get_type(web->task->private, struct web_server_data);
+		wdata = talloc_get_type(web->task->private_data, struct web_server_data);
 		if (wdata == NULL) goto failed;
 		wdata->http_process_input(wdata, web);
 		talloc_unlink(web->task, web);
@@ -220,7 +220,7 @@ failed:
 */
 static void websrv_send(struct stream_connection *conn, uint16_t flags)
 {
-	struct websrv_context *web = talloc_get_type(conn->private, 
+	struct websrv_context *web = talloc_get_type(conn->private_data,
 						     struct websrv_context);
 	NTSTATUS status;
 	size_t nsent;
@@ -251,8 +251,8 @@ static void websrv_send(struct stream_connection *conn, uint16_t flags)
 */
 static void websrv_accept(struct stream_connection *conn)
 {
-	struct task_server *task = talloc_get_type(conn->private, struct task_server);
-	struct web_server_data *wdata = talloc_get_type(task->private, struct web_server_data);
+	struct task_server *task = talloc_get_type(conn->private_data, struct task_server);
+	struct web_server_data *wdata = talloc_get_type(task->private_data, struct web_server_data);
 	struct websrv_context *web;
 	struct socket_context *tls_socket;
 
@@ -261,7 +261,7 @@ static void websrv_accept(struct stream_connection *conn)
 
 	web->task = task;
 	web->conn = conn;
-	conn->private = web;
+	conn->private_data = web;
 	talloc_set_destructor(web, websrv_destructor);
 
 	event_add_timed(conn->event.ctx, web, 
@@ -343,7 +343,7 @@ static void websrv_task_init(struct task_server *task)
 	wdata = talloc_zero(task, struct web_server_data);
 	if (wdata == NULL)goto failed;
 
-	task->private = wdata;
+	task->private_data = wdata;
 	
 	wdata->tls_params = tls_initialise(wdata, task->lp_ctx);
 	if (wdata->tls_params == NULL) goto failed;
diff --git a/source4/web_server/web_server.h b/source4/web_server/web_server.h
index f91c766494..3b02feaf7d 100644
--- a/source4/web_server/web_server.h
+++ b/source4/web_server/web_server.h
@@ -25,7 +25,7 @@ struct web_server_data {
 	struct tls_params *tls_params;
 	void (*http_process_input)(struct web_server_data *wdata, 
 				   struct websrv_context *web);
-	void *private;	
+	void *private_data;
 };
 
 struct http_header {
diff --git a/source4/web_server/wsgi.c b/source4/web_server/wsgi.c
index 53ba2a2d9b..4d6b441f17 100644
--- a/source4/web_server/wsgi.c
+++ b/source4/web_server/wsgi.c
@@ -323,7 +323,7 @@ static void wsgi_process_http_input(struct web_server_data *wdata,
 				    struct websrv_context *web)
 {
 	PyObject *py_environ, *result, *item, *iter;
-	PyObject *request_handler = wdata->private;
+	PyObject *request_handler = (PyObject *)wdata->private_data;
 	struct socket_address *socket_address;
 
 	web_request_Object *py_web = PyObject_New(web_request_Object, &web_request_Type);
@@ -386,6 +386,6 @@ bool wsgi_initialize(struct web_server_data *wdata)
 		DEBUG(0, ("Unable to find SWAT\n"));
 		return false;
 	}
-	wdata->private = py_swat;
+	wdata->private_data = py_swat;
 	return true;
 }