diff options
| author | Simo Sorce <idra@samba.org> | 2011-08-09 16:44:52 -0400 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2011-08-10 18:14:05 +0200 |
| commit | 7a071625581af876f8fd73b35a70eccd0d838208 (patch) | |
| tree | 3bff5dd01764fef08a856c17ab5385a8c1b885de /source3/lib | |
| parent | f00681fe9a78e5c0b02daff2fd83a568f8d95eff (diff) | |
| download | samba-7a071625581af876f8fd73b35a70eccd0d838208.tar.gz samba-7a071625581af876f8fd73b35a70eccd0d838208.tar.bz2 samba-7a071625581af876f8fd73b35a70eccd0d838208.zip | |
s3-prefork: Fix use of child id.
Children Ids must start at 1 as 0 represent the father.
Also fix callbacks that restart logs to use a procedd global variable that
holds the Id so that they work correctly both fot the parent process and the
children.
Signed-off-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/server_prefork.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/server_prefork.c b/source3/lib/server_prefork.c index 54a0dbc171..501fbc1b88 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], i, + &pfp->pool[i], i + 1, 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], i, + &pfp->pool[i], i + 1, pfp->listen_fd_size, pfp->listen_fds, pfp->lock_fd, |