diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-02-05 14:51:01 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-05 14:51:01 +1100 |
| commit | 24d0587752ca81ac9e35c6c4dbcadb87455f5ded (patch) | |
| tree | 400c3cdc5fdfc2f3bd278b14770f7ef6cd5585b6 /source4/smbd/process_single.c | |
| parent | c46b8708f443f2f048cf41f693dfe6c133fe53f3 (diff) | |
| download | samba-24d0587752ca81ac9e35c6c4dbcadb87455f5ded.tar.gz samba-24d0587752ca81ac9e35c6c4dbcadb87455f5ded.tar.bz2 samba-24d0587752ca81ac9e35c6c4dbcadb87455f5ded.zip | |
Clarify nomaclature of socket names in process_single and process_prefork
Fix talloc_steal in both cases to steal connected socket (from accept)
onto it's private structure, rather than stealing the bound socket.
Remove termination code from the prefork modal, we want the process to
still stay around, to serve future clients.
Andrew Bartlett and David Disseldorp
(This used to be commit 07590d893e993919cf6cb7582310777f534e756f)
Diffstat (limited to 'source4/smbd/process_single.c')
| -rw-r--r-- | source4/smbd/process_single.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c index 2d3c94ca6d..a7a27ef9e0 100644 --- a/source4/smbd/process_single.c +++ b/source4/smbd/process_single.c @@ -38,7 +38,7 @@ static void single_model_init(struct event_context *ev) */ static void single_accept_connection(struct event_context *ev, struct loadparm_context *lp_ctx, - struct socket_context *sock, + struct socket_context *listen_socket, void (*new_conn)(struct event_context *, struct loadparm_context *, struct socket_context *, @@ -46,10 +46,10 @@ static void single_accept_connection(struct event_context *ev, void *private) { NTSTATUS status; - struct socket_context *sock2; + struct socket_context *connected_socket; /* accept an incoming connection. */ - status = socket_accept(sock, &sock2); + status = socket_accept(listen_socket, &connected_socket); if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("single_accept_connection: accept: %s\n", nt_errstr(status))); /* this looks strange, but is correct. @@ -67,11 +67,12 @@ static void single_accept_connection(struct event_context *ev, return; } - talloc_steal(private, sock); + talloc_steal(private, connected_socket); /* The cluster_id(0, fd) cannot collide with the incrementing * task below, as the first component is 0, not 1 */ - new_conn(ev, lp_ctx, sock2, cluster_id(0, socket_get_fd(sock2)), private); + new_conn(ev, lp_ctx, connected_socket, + cluster_id(0, socket_get_fd(connected_socket)), private); } /* |