]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
auth/spnego: fix gensec_update_ev() argument order for the SPNEGO_FALLBACK case
authorStefan Metzmacher <metze@samba.org>
Fri, 12 May 2017 07:10:19 +0000 (09:10 +0200)
committerKarolin Seeger <kseeger@samba.org>
Fri, 30 Jun 2017 08:46:22 +0000 (10:46 +0200)
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

index 5f5047a808cc3adb0737d7a6c90f665d64f26ecc..962e1fc4f5b339cd5ce6c32d4b477a22115bab02 100644 (file)
@@ -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"));
@@ -756,8 +756,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;