[Patch] s4:http/gensec: add missing tevent_req_done() to gensec_http_ntlm_update_done() (bug #12919)

Jeremy Allison jra at samba.org
Thu Jul 20 22:59:29 UTC 2017


On Fri, Jul 21, 2017 at 12:01:09AM +0200, Stefan Metzmacher via samba-technical wrote:
> Hi,
> 
> I just found a regression happened in this commit:
> https://git.samba.org/?p=samba.git;a=commitdiff;h=d718e92d5e145dccd492c4
> (s4:gensec/http_ntlm: add implement gensec_http_ntlm_update_send/recv())
> 
> This fix it trivial...
> 
> Please review and push:-)

LGTM. Reviewed-by: Jeremy Allison <jra at samba.org>

Thanks Metze !

Jeremy.

> From cc756c50d79f34ee3c39961db62239453b7e0c92 Mon Sep 17 00:00:00 2001
> From: Stefan Metzmacher <metze at samba.org>
> Date: Thu, 20 Jul 2017 11:56:21 +0200
> Subject: [PATCH] s4:http/gensec: add missing tevent_req_done() to
>  gensec_http_ntlm_update_done()
> 
> This was missing in commit d718e92d5e145dccd492c46febc249e462ce50c6.
> 
> Sadly we can't have automated tests for this as we only implement
> the client side for this protocol.
> 
> I've tested with using:
> 
> bin/smbtorture \
>   -W BLA --realm=BLA.BASE \
>   -s /dev/null -Uadministrator%A1b2C3d4 \
>   ncacn_http:w2k8r2-219[593,RpcProxy=w2k8r2-219.bla.base,HttpUseTls=false,HttpAuthOption=basic] \
>   rpc.epmapper.epmapper.Lookup_simple \
> 
> and:
> 
> bin/smbtorture \
>   -W BLA --realm=BLA.BASE \
>   -s /dev/null -Uadministrator%A1b2C3d4 \
>   ncacn_http:w2k8r2-219[593,RpcProxy=w2k8r2-219.bla.base,HttpUseTls=false,HttpAuthOption=ntlm] \
>   rpc.epmapper.epmapper.Lookup_simple \
> 
> BUG: https://bugzilla.samba.org/show_bug.cgi?id=12919
> 
> Signed-off-by: Stefan Metzmacher <metze at samba.org>
> ---
>  source4/lib/http/gensec/ntlm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/source4/lib/http/gensec/ntlm.c b/source4/lib/http/gensec/ntlm.c
> index 7d692ed..788fb7d 100644
> --- a/source4/lib/http/gensec/ntlm.c
> +++ b/source4/lib/http/gensec/ntlm.c
> @@ -134,7 +134,7 @@ static void gensec_http_ntlm_update_done(struct tevent_req *subreq)
>  	}
>  
>  	state->out = data_blob_string_const(str);
> -	return;
> +	tevent_req_done(req);
>  }
>  
>  static NTSTATUS gensec_http_ntlm_update_recv(struct tevent_req *req,
> -- 
> 1.9.1
> 







More information about the samba-technical mailing list