From 2f5ca872a80ad872ab864061f0c6982d8605393f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 6 Dec 2007 16:54:34 +0100 Subject: r26313: Fix more uses of static loadparm. (This used to be commit 6fd0d9d3b75546d08c24c513e05b1843d5777608) --- source4/smbd/service_stream.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'source4/smbd') diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c index 2ad2650486..8df8c474f5 100644 --- a/source4/smbd/service_stream.c +++ b/source4/smbd/service_stream.c @@ -241,6 +241,7 @@ NTSTATUS stream_setup_socket(struct event_context *event_context, const char *family, const char *sock_addr, uint16_t *port, + const char *socket_options, void *private) { NTSTATUS status; @@ -260,9 +261,10 @@ NTSTATUS stream_setup_socket(struct event_context *event_context, status = socket_set_option(stream_socket->sock, "SO_KEEPALIVE", NULL); NT_STATUS_NOT_OK_RETURN(status); - status = socket_set_option(stream_socket->sock, lp_socket_options(global_loadparm), - NULL); - NT_STATUS_NOT_OK_RETURN(status); + if (socket_options != NULL) { + status = socket_set_option(stream_socket->sock, socket_options, NULL); + NT_STATUS_NOT_OK_RETURN(status); + } /* TODO: set socket ACL's here when they're implemented */ -- cgit