[PATCH] honor 'socket options' from winbind

[Jeremy Allison]

On Wed, Jun 15, 2016 at 04:07:49PM -0400, Jim McDonough wrote:
> Currently, for ports 139 and 445, the smb.conf "socket options" are set
> from smbd and libsmbclient (cliconnect.c).  However, in winbind
> connection manager, we do not set them.  I couldn't think of a reason why...
> 
> The attached patch adds them before negprot.

Makes sense to me - pushed. Was there any specific bug
that triggered this fix ?

> From b65cd8deb7d1d9edf58dd15bc5fba98f9ca4a2c2 Mon Sep 17 00:00:00 2001
> From: Jim McDonough <jmcd at samba.org>
> Date: Wed, 15 Jun 2016 15:57:01 -0400
> Subject: [PATCH] winbind: honor 'socket options' in winbind
> 
> Set socket options from smb.conf before negprot, as done by libsmbclient
> 
> Signed-off-by: Jim McDonough <jmcd at samba.org>
> ---
>  source3/winbindd/winbindd_cm.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
> index 1de731a..e18f638 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());
> -- 
> 2.6.6
>