Attachment 13331 Details for Bug 12788 – Patch for v4-6-test

[patch] Patch for v4-6-test

tmp46.diff.txt (text/plain), 1.57 KB, created by Stefan Metzmacher on 2017-06-29 13:57:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2017-06-29 13:57:25 UTC

Size: 1.57 KB

patch

obsolete

>From 27077ba98f0418d40ca1acfc03f89d95aaf7a7d1 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Fri, 12 May 2017 09:10:19 +0200
>Subject: [PATCH] auth/spnego: fix gensec_update_ev() argument order for the
> SPNEGO_FALLBACK case
>
>This went unnoticed so long as we don't use -Wc++-compat
>and gensec_update_ev() used the sync update() hook for all
>NTLMSSP and Kerberos.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12788
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit 31691963b3d9ac460df0c56d36f81ec815db0225)
>---
> auth/gensec/spnego.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/auth/gensec/spnego.c b/auth/gensec/spnego.c
>index f063f7b..21c6cfb 100644
>--- a/auth/gensec/spnego.c
>+++ b/auth/gensec/spnego.c
>@@ -366,7 +366,7 @@ static NTSTATUS gensec_spnego_server_try_fallback(struct gensec_security *gensec
> 			return nt_status;
> 		}
> 		nt_status = gensec_update_ev(spnego_state->sub_sec_security,
>-					  ev, out_mem_ctx, in, out);
>+					     out_mem_ctx, ev, in, out);
> 		return nt_status;
> 	}
> 	DEBUG(1, ("Failed to parse SPNEGO request\n"));
>@@ -804,8 +804,8 @@ static NTSTATUS gensec_spnego_update(struct gensec_security *gensec_security, TA
> 
> 	switch (spnego_state->state_position) {
> 	case SPNEGO_FALLBACK:
>-		return gensec_update_ev(spnego_state->sub_sec_security, ev,
>-				     out_mem_ctx, in, out);
>+		return gensec_update_ev(spnego_state->sub_sec_security,
>+					out_mem_ctx, ev, in, out);
> 	case SPNEGO_SERVER_START:
> 	{
> 		NTSTATUS nt_status;
>-- 
>1.9.1
>

Flags:

slow: review+

Actions: View

Attachments on bug 12788: 13331 | 13332