sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

Revert "auth4: auth_session_info_fill_unix only needs a tevent_context"

Browse Source 
This reverts commit 75d7c4609c.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Volker Lendecke 2014-02-18 09:50:03 +01:00
parent 97c6fd4010
commit cb5d5ee247
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source4/auth/ntlm/auth.c
View File

@ -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")); DEBUG(1, ("Cannot contact winbind to provide unix token\n"));
return NT_STATUS_INVALID_SERVER_STATE; return NT_STATUS_INVALID_SERVER_STATE;
} }
status = auth_session_info_fill_unix(wbc_ctx->event_ctx, status = auth_session_info_fill_unix(wbc_ctx, auth_context->lp_ctx,
auth_context->lp_ctx,
original_user_name, *session_info); original_user_name, *session_info);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(*session_info); TALLOC_FREE(*session_info);

4
source4/auth/unix_token.c
View File

@ -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 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, struct loadparm_context *lp_ctx,
const char *original_user_name, const char *original_user_name,
struct auth_session_info *session_info) struct auth_session_info *session_info)
{ {
char *su; char *su;
size_t len; 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->security_token,
&session_info->unix_token); &session_info->unix_token);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {