From fa893e815ba538e2a28302bfc17a75fac9e7aaa4 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Fri, 5 Aug 2011 10:34:05 -0400 Subject: s3-prefork: Pass the child a child_id Signed-off-by: Andreas Schneider --- source3/lib/server_prefork.c | 4 ++-- source3/lib/server_prefork.h | 1 + source3/printing/spoolssd.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source3/lib/server_prefork.c b/source3/lib/server_prefork.c index 47020b2740..54a0dbc171 100644 --- a/source3/lib/server_prefork.c +++ b/source3/lib/server_prefork.c @@ -121,7 +121,7 @@ bool prefork_create_pool(TALLOC_CTX *mem_ctx, pfp->pool[i].status = PF_WORKER_IDLE; ret = pfp->main_fn(ev_ctx, msg_ctx, - &pfp->pool[i], + &pfp->pool[i], i, pfp->listen_fd_size, pfp->listen_fds, pfp->lock_fd, @@ -206,7 +206,7 @@ int prefork_add_children(struct tevent_context *ev_ctx, pfp->pool[i].status = PF_WORKER_IDLE; ret = pfp->main_fn(ev_ctx, msg_ctx, - &pfp->pool[i], + &pfp->pool[i], i, pfp->listen_fd_size, pfp->listen_fds, pfp->lock_fd, diff --git a/source3/lib/server_prefork.h b/source3/lib/server_prefork.h index d3ba919950..31ebe213bb 100644 --- a/source3/lib/server_prefork.h +++ b/source3/lib/server_prefork.h @@ -76,6 +76,7 @@ struct pf_worker_data { typedef int (prefork_main_fn_t)(struct tevent_context *ev, struct messaging_context *msg_ctx, struct pf_worker_data *pf, + int child_id, int listen_fd_size, int *listen_fds, int lock_fd, diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c index 1297b58129..2e68a97e32 100644 --- a/source3/printing/spoolssd.c +++ b/source3/printing/spoolssd.c @@ -359,6 +359,7 @@ static void spoolss_next_client(void *pvt); static int spoolss_children_main(struct tevent_context *ev_ctx, struct messaging_context *msg_ctx, struct pf_worker_data *pf, + int child_id, int listen_fd_size, int *listen_fds, int lock_fd, -- cgit