diff options
| author | Volker Lendecke <vl@samba.org> | 2014-02-18 09:50:03 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2014-02-18 10:29:04 +0100 |
| commit | cb5d5ee247d7cb6939e04536befef10b3beb04fa (patch) | |
| tree | 2fe34dec7f4d438ba23d7efc66d19ef20a81e926 /source4/auth | |
| parent | 97c6fd4010b28d6c099a3150e2822cd800c626e2 (diff) | |
| download | samba-cb5d5ee247d7cb6939e04536befef10b3beb04fa.tar.gz samba-cb5d5ee247d7cb6939e04536befef10b3beb04fa.tar.xz samba-cb5d5ee247d7cb6939e04536befef10b3beb04fa.zip | |
Revert "auth4: auth_session_info_fill_unix only needs a tevent_context"
This reverts commit 75d7c4609c1c743f84ca9f2d0666aece9e5200d4.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/ntlm/auth.c | 3 | ||||
| -rw-r--r-- | source4/auth/unix_token.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c index a8c257f94ae..263dc8031d0 100644 --- a/source4/auth/ntlm/auth.c +++ b/source4/auth/ntlm/auth.c @@ -469,8 +469,7 @@ static NTSTATUS auth_generate_session_info_wrapper(struct auth4_context *auth_co DEBUG(1, ("Cannot contact winbind to provide unix token\n")); return NT_STATUS_INVALID_SERVER_STATE; } - status = auth_session_info_fill_unix(wbc_ctx->event_ctx, - auth_context->lp_ctx, + status = auth_session_info_fill_unix(wbc_ctx, auth_context->lp_ctx, original_user_name, *session_info); if (!NT_STATUS_IS_OK(status)) { TALLOC_FREE(*session_info); diff --git a/source4/auth/unix_token.c b/source4/auth/unix_token.c index efc9a9db4a6..32f62a77a10 100644 --- a/source4/auth/unix_token.c +++ b/source4/auth/unix_token.c @@ -121,14 +121,14 @@ NTSTATUS security_token_to_unix_token(TALLOC_CTX *mem_ctx, /* Fill in the auth_user_info_unix and auth_unix_token elements in a struct session_info */ -NTSTATUS auth_session_info_fill_unix(struct tevent_context *ev, +NTSTATUS auth_session_info_fill_unix(struct wbc_context *wbc_ctx, struct loadparm_context *lp_ctx, const char *original_user_name, struct auth_session_info *session_info) { char *su; size_t len; - NTSTATUS status = security_token_to_unix_token(session_info, ev, + NTSTATUS status = security_token_to_unix_token(session_info, wbc_ctx->event_ctx, session_info->security_token, &session_info->unix_token); if (!NT_STATUS_IS_OK(status)) { |