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>

diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index a8c257f94aef1786fb1a864d85d9ec7317120259..263dc8031d020889a7e6abac91994d1167c8851d 100644 (file)
--- 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 efc9a9db4a67ff7ee10d40ae64b86678f542793e..32f62a77a10f9cff03fe6cf09438743600c61a04 100644 (file)
--- 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)) {