diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-02-04 17:49:49 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-02-18 02:19:35 +0100 |
| commit | e786e8fef9960aadf1e94c70c0fb7ec18c1ed237 (patch) | |
| tree | 63250524203335db77f2f039f8bcb72d7ba79872 /source4 | |
| parent | dd479bd2927a6b470e2b6c6b89ef0e4fdd457d55 (diff) | |
| download | samba-e786e8fef9960aadf1e94c70c0fb7ec18c1ed237.tar.gz samba-e786e8fef9960aadf1e94c70c0fb7ec18c1ed237.tar.bz2 samba-e786e8fef9960aadf1e94c70c0fb7ec18c1ed237.zip | |
auth: Reorder arguments to generate_session_info
This matches check_ntlm_password() and generate_session_info_pac()
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Sat Feb 18 02:19:35 CET 2012 on sn-devel-104
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/auth/ntlm/auth.c | 14 | ||||
| -rw-r--r-- | source4/auth/ntlm/auth_simple.c | 3 | ||||
| -rw-r--r-- | source4/smb_server/smb/sesssetup.c | 8 |
3 files changed, 13 insertions, 12 deletions
diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c index fdfdb635f9..5c65da955d 100644 --- a/source4/auth/ntlm/auth.c +++ b/source4/auth/ntlm/auth.c @@ -33,9 +33,9 @@ #include "auth/kerberos/kerberos.h" #include "auth/kerberos/kerberos_util.h" -static NTSTATUS auth_generate_session_info_wrapper(TALLOC_CTX *mem_ctx, - struct auth4_context *auth_context, - void *server_returned_info, +static NTSTATUS auth_generate_session_info_wrapper(struct auth4_context *auth_context, + TALLOC_CTX *mem_ctx, + void *server_returned_info, const char *original_user_name, uint32_t session_info_flags, struct auth_session_info **session_info); @@ -139,7 +139,7 @@ static NTSTATUS auth_generate_session_info_principal(struct auth4_context *auth_ return nt_status; } - nt_status = auth_generate_session_info_wrapper(mem_ctx, auth_ctx, + nt_status = auth_generate_session_info_wrapper(auth_ctx, mem_ctx, user_info_dc, user_info_dc->info->account_name, session_info_flags, session_info); @@ -465,8 +465,8 @@ _PUBLIC_ NTSTATUS auth_check_password_recv(struct tevent_req *req, * know that session_info is generated from the main ldb, and because * we need to break a depenency loop between the DCE/RPC layer and the * generation of unix tokens via IRPC */ -static NTSTATUS auth_generate_session_info_wrapper(TALLOC_CTX *mem_ctx, - struct auth4_context *auth_context, +static NTSTATUS auth_generate_session_info_wrapper(struct auth4_context *auth_context, + TALLOC_CTX *mem_ctx, void *server_returned_info, const char *original_user_name, uint32_t session_info_flags, @@ -543,7 +543,7 @@ static NTSTATUS auth_generate_session_info_pac(struct auth4_context *auth_ctx, session_info_flags |= AUTH_SESSION_INFO_AUTHENTICATED; } - status = auth_generate_session_info_wrapper(mem_ctx, auth_ctx, + status = auth_generate_session_info_wrapper(auth_ctx, mem_ctx, user_info_dc, user_info_dc->info->account_name, session_info_flags, session_info); diff --git a/source4/auth/ntlm/auth_simple.c b/source4/auth/ntlm/auth_simple.c index 2e69991926..f6dd9d0e6b 100644 --- a/source4/auth/ntlm/auth_simple.c +++ b/source4/auth/ntlm/auth_simple.c @@ -94,7 +94,8 @@ _PUBLIC_ NTSTATUS authenticate_username_pw(TALLOC_CTX *mem_ctx, if (user_info_dc->info->authenticated) { flags |= AUTH_SESSION_INFO_AUTHENTICATED; } - nt_status = auth_context->generate_session_info(tmp_ctx, auth_context, + nt_status = auth_context->generate_session_info(auth_context, + tmp_ctx, user_info_dc, nt4_username, flags, diff --git a/source4/smb_server/smb/sesssetup.c b/source4/smb_server/smb/sesssetup.c index 2943747521..57460fa72d 100644 --- a/source4/smb_server/smb/sesssetup.c +++ b/source4/smb_server/smb/sesssetup.c @@ -83,8 +83,8 @@ static void sesssetup_old_send(struct tevent_req *subreq) flags |= AUTH_SESSION_INFO_AUTHENTICATED; } /* This references user_info_dc into session_info */ - status = req->smb_conn->negotiate.auth_context->generate_session_info(req, - req->smb_conn->negotiate.auth_context, + status = req->smb_conn->negotiate.auth_context->generate_session_info(req->smb_conn->negotiate.auth_context, + req, user_info_dc, sess->old.in.user, flags, &session_info); if (!NT_STATUS_IS_OK(status)) goto failed; @@ -215,8 +215,8 @@ static void sesssetup_nt1_send(struct tevent_req *subreq) flags |= AUTH_SESSION_INFO_AUTHENTICATED; } /* This references user_info_dc into session_info */ - status = state->auth_context->generate_session_info(req, - state->auth_context, + status = state->auth_context->generate_session_info(state->auth_context, + req, user_info_dc, sess->nt1.in.user, flags, |