From e786e8fef9960aadf1e94c70c0fb7ec18c1ed237 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 4 Feb 2012 17:49:49 +1100 Subject: auth: Reorder arguments to generate_session_info This matches check_ntlm_password() and generate_session_info_pac() Andrew Bartlett Autobuild-User: Andrew Bartlett Autobuild-Date: Sat Feb 18 02:19:35 CET 2012 on sn-devel-104 --- auth/common_auth.h | 4 ++-- auth/ntlmssp/gensec_ntlmssp_server.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'auth') diff --git a/auth/common_auth.h b/auth/common_auth.h index d9996e1ee4..c0fd6b6d60 100644 --- a/auth/common_auth.h +++ b/auth/common_auth.h @@ -117,8 +117,8 @@ struct auth4_context { NTSTATUS (*set_challenge)(struct auth4_context *auth_ctx, const uint8_t chal[8], const char *set_by); - NTSTATUS (*generate_session_info)(TALLOC_CTX *mem_ctx, - struct auth4_context *auth_context, + NTSTATUS (*generate_session_info)(struct auth4_context *auth_context, + TALLOC_CTX *mem_ctx, void *server_returned_info, const char *original_user_name, uint32_t session_info_flags, diff --git a/auth/ntlmssp/gensec_ntlmssp_server.c b/auth/ntlmssp/gensec_ntlmssp_server.c index 8f45c2c664..a1d43e6bca 100644 --- a/auth/ntlmssp/gensec_ntlmssp_server.c +++ b/auth/ntlmssp/gensec_ntlmssp_server.c @@ -235,7 +235,7 @@ NTSTATUS gensec_ntlmssp_session_info(struct gensec_security *gensec_security, session_info_flags |= AUTH_SESSION_INFO_DEFAULT_GROUPS; if (gensec_security->auth_context && gensec_security->auth_context->generate_session_info) { - nt_status = gensec_security->auth_context->generate_session_info(mem_ctx, gensec_security->auth_context, + nt_status = gensec_security->auth_context->generate_session_info(gensec_security->auth_context, mem_ctx, gensec_ntlmssp->server_returned_info, gensec_ntlmssp->ntlmssp_state->user, session_info_flags, -- cgit