diff options
| author | Volker Lendecke <vl@samba.org> | 2021-01-12 17:03:42 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2021-01-14 13:29:35 +0000 |
| commit | 6482bee22fe421266ea493d18367aa2a0444ef76 (patch) | |
| tree | 1c5247abf1ec570d84b9faf79723b84a9539537a | |
| parent | 50dada72ad97cffef25011a57fa6cc5bce80c5d4 (diff) | |
| download | samba-6482bee22fe421266ea493d18367aa2a0444ef76.tar.gz | |
rpc_server: Move setting ip-based socket options
All ncacn_ip_tcp listener sockets are created via
dcesrv_create_ncacn_ip_tcp_socket(). Moving setting the socket options
out of dcesrv_setup_ncacn_ip_tcp_socket() to remove a special case for
TCP from the dcesrv_setup_* family of routines.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Samuel Cabrero <scabrero@samba.org>
| -rw-r--r-- | source3/rpc_server/rpc_server.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c index a2a2115ab81..c58d76a947d 100644 --- a/source3/rpc_server/rpc_server.c +++ b/source3/rpc_server/rpc_server.c @@ -300,6 +300,10 @@ NTSTATUS dcesrv_create_ncacn_ip_tcp_socket(const struct sockaddr_storage *ifss, return NT_STATUS_UNSUCCESSFUL; } + /* ready to listen */ + set_socket_options(fd, "SO_KEEPALIVE"); + set_socket_options(fd, lp_socket_options()); + DBG_DEBUG("Opened ncacn_ip_tcp socket fd %d for port %u\n", fd, *port); *out_fd = fd; @@ -337,10 +341,6 @@ NTSTATUS dcesrv_setup_ncacn_ip_tcp_socket(struct tevent_context *ev_ctx, state->termination_fn = term_fn; state->termination_data = term_data; - /* ready to listen */ - set_socket_options(state->fd, "SO_KEEPALIVE"); - set_socket_options(state->fd, lp_socket_options()); - /* Set server socket to non-blocking for the accept. */ rc = set_blocking(state->fd, false); if (rc < 0) { |