summaryrefslogtreecommitdiff
path: root/source4/auth
diff options
context:
space:
mode:
Diffstat (limited to 'source4/auth')
-rw-r--r--source4/auth/ntlm/auth.c14
-rw-r--r--source4/auth/ntlm/auth_simple.c3
2 files changed, 9 insertions, 8 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,