From: Jim McDonough Date: Wed, 15 Jun 2016 19:57:01 +0000 (-0400) Subject: winbind: honor 'socket options' in winbind X-Git-Tag: tdb-1.3.10~830 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a274d9ae76ddad9a0b609bddfa007afee61c0ca;p=thirdparty%2Fsamba.git winbind: honor 'socket options' in winbind Set socket options from smb.conf before negprot, as done by libsmbclient Signed-off-by: Jim McDonough Reviewed-by: Jeremy Allison --- diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 1de731a5ba8..e18f6382519 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -1055,6 +1055,8 @@ static NTSTATUS cm_prepare_connection(struct winbindd_domain *domain, cli_set_timeout(*cli, 10000); /* 10 seconds */ + set_socket_options(sockfd, lp_socket_options()); + result = smbXcli_negprot((*cli)->conn, (*cli)->timeout, lp_client_ipc_min_protocol(), lp_client_ipc_max_protocol());