s4:service_task: s/private/private_data

metze

diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c
index 98d1c1b06c33ed78035bc034c31e4f2f4dcdff95..152bbec4d5f28a99ee86ed5a4d98c09118f1db94 100644 (file)
--- a/source4/dsdb/repl/drepl_service.c
+++ b/source4/dsdb/repl/drepl_service.c
@@ -140,7 +140,7 @@ static void dreplsrv_task_init(struct task_server *task)
        }
        service->task           = task;
        service->startup_time   = timeval_current();
-       task->private           = service;
+       task->private_data      = service;
 
        status = dreplsrv_init_creds(service);
        if (!W_ERROR_IS_OK(status)) {

diff --git a/source4/smbd/service_task.h b/source4/smbd/service_task.h
index f5788da021b05de69b58608fb987069f5225f57c..69ecb1b970be2c63570fd921f93d9f409b06330d 100644 (file)
--- a/source4/smbd/service_task.h
+++ b/source4/smbd/service_task.h
@@ -30,7 +30,7 @@ struct task_server {
        struct messaging_context *msg_ctx;
        struct loadparm_context *lp_ctx;
        struct server_id server_id;
-       void *private;
+       void *private_data;
 };
 
 

diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index 9d1d160ae723dbd0254b68f57e29de4d0a9abb29..1c7449fb473ed5ecdb270d46a841f41ec3936e56 100644 (file)
--- a/source4/web_server/web_server.c
+++ b/source4/web_server/web_server.c
@@ -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);
@@ -252,7 +252,7 @@ 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 web_server_data *wdata = talloc_get_type(task->private_data, struct web_server_data);
        struct websrv_context *web;
        struct socket_context *tls_socket;
 
@@ -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/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index 5e100f46ccd1b761c9cad5619b239d3fd4020923..c8316a5f4c4c17a0a30d530d9bec021ee6a06f03 100644 (file)
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -464,7 +464,7 @@ static void wreplsrv_task_init(struct task_server *task)
        }
        service->task           = task;
        service->startup_time   = timeval_current();
-       task->private           = service;
+       task->private_data      = service;
 
        /*
         * setup up all partners, and open the winsdb