summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-02-02 10:21:51 +0100
committerStefan Metzmacher <metze@samba.org>2009-02-02 13:08:59 +0100
commit1441e87e249190bd9fea72773b8fd014a05f9861 (patch)
tree95736ea5ac26b9ce016a92fd6f48b14b5e31c916
parent0ac7792e022107c352f5464f52563c4e885272dd (diff)
downloadsamba-1441e87e249190bd9fea72773b8fd014a05f9861.tar.gz
samba-1441e87e249190bd9fea72773b8fd014a05f9861.tar.bz2
samba-1441e87e249190bd9fea72773b8fd014a05f9861.zip
s4:service_task: s/private/private_data
metze
-rw-r--r--source4/dsdb/repl/drepl_service.c2
-rw-r--r--source4/smbd/service_task.h2
-rw-r--r--source4/web_server/web_server.c6
-rw-r--r--source4/wrepl_server/wrepl_server.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c
index 98d1c1b06c..152bbec4d5 100644
--- 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 f5788da021..69ecb1b970 100644
--- 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 9d1d160ae7..1c7449fb47 100644
--- 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 5e100f46cc..c8316a5f4c 100644
--- 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