diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-06 16:54:34 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:25 +0100 |
| commit | 2f5ca872a80ad872ab864061f0c6982d8605393f (patch) | |
| tree | 061592e4ae1e79adc57cd5d99ff2fd6f3b8c2549 /source4/smbd | |
| parent | fb29325f1d4feba6c3f52b690d3da5d492618c4f (diff) | |
| download | samba-2f5ca872a80ad872ab864061f0c6982d8605393f.tar.gz samba-2f5ca872a80ad872ab864061f0c6982d8605393f.tar.bz2 samba-2f5ca872a80ad872ab864061f0c6982d8605393f.zip | |
r26313: Fix more uses of static loadparm.
(This used to be commit 6fd0d9d3b75546d08c24c513e05b1843d5777608)
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/service_stream.c | 8 |
1 files changed, 5 insertions, 3 deletions
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 */ |