diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-05 19:03:43 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-01-05 13:06:03 -0600 |
| commit | df408d056ec03f2abe08ce0ea487e1875b90e7bf (patch) | |
| tree | 68cb7b83f12d50d8536acef9c1fed74d22ad9f54 /source4/smbd/process_standard.c | |
| parent | 01c79091924602bb5c3f1c0c823b2577c4708f6a (diff) | |
| download | samba-df408d056ec03f2abe08ce0ea487e1875b90e7bf.tar.gz samba-df408d056ec03f2abe08ce0ea487e1875b90e7bf.tar.bz2 samba-df408d056ec03f2abe08ce0ea487e1875b90e7bf.zip | |
r26672: Janitorial: Remove uses of global_loadparm.
(This used to be commit 18cd08623eaad7d2cd63b82ea5275d4dfd21cf00)
Diffstat (limited to 'source4/smbd/process_standard.c')
| -rw-r--r-- | source4/smbd/process_standard.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c index 09d32d05aa..c088ea3b1a 100644 --- a/source4/smbd/process_standard.c +++ b/source4/smbd/process_standard.c @@ -56,8 +56,10 @@ static void standard_model_init(struct event_context *ev) called when a listening socket becomes readable. */ static void standard_accept_connection(struct event_context *ev, + struct loadparm_context *lp_ctx, struct socket_context *sock, - void (*new_conn)(struct event_context *, struct socket_context *, + void (*new_conn)(struct event_context *, + struct loadparm_context *, struct socket_context *, struct server_id , void *), void *private) { @@ -126,7 +128,7 @@ static void standard_accept_connection(struct event_context *ev, talloc_free(s); /* setup this new connection */ - new_conn(ev2, sock2, cluster_id(pid), private); + new_conn(ev2, lp_ctx, sock2, cluster_id(pid), private); /* we can't return to the top level here, as that event context is gone, so we now process events in the new event context until there are no @@ -141,7 +143,8 @@ static void standard_accept_connection(struct event_context *ev, called to create a new server task */ static void standard_new_task(struct event_context *ev, - void (*new_task)(struct event_context *, struct server_id , void *), + struct loadparm_context *lp_ctx, + void (*new_task)(struct event_context *, struct loadparm_context *lp_ctx, struct server_id , void *), void *private) { pid_t pid; @@ -179,7 +182,7 @@ static void standard_new_task(struct event_context *ev, setproctitle("task server_id[%d]", pid); /* setup this new connection */ - new_task(ev2, cluster_id(pid), private); + new_task(ev2, lp_ctx, cluster_id(pid), private); /* we can't return to the top level here, as that event context is gone, so we now process events in the new event context until there are no |