auth4: security_token_to_unix_token only needs a tevent_context
authorVolker Lendecke <vl@samba.org>
Sun, 2 Feb 2014 14:45:47 +0000 (15:45 +0100)
committerVolker Lendecke <vl@samba.org>
Mon, 10 Feb 2014 09:57:18 +0000 (10:57 +0100)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Kai Blin <kai@samba.org>
source4/auth/unix_token.c
source4/ntvfs/unixuid/vfs_unixuid.c

index aee950d9166cb9e374c621004a4973c165ae6865..32f62a77a10f9cff03fe6cf09438743600c61a04 100644 (file)
@@ -29,7 +29,7 @@
   form a security_unix_token from the current security_token
 */
 NTSTATUS security_token_to_unix_token(TALLOC_CTX *mem_ctx,
-                                     struct wbc_context *wbc_ctx,
+                                     struct tevent_context *ev,
                                      struct security_token *token,
                                      struct security_unix_token **sec)
 {
@@ -55,7 +55,7 @@ NTSTATUS security_token_to_unix_token(TALLOC_CTX *mem_ctx,
                ids[s].status = ID_UNKNOWN;
        }
 
-       status = wbc_sids_to_xids(wbc_ctx->event_ctx, ids, token->num_sids);
+       status = wbc_sids_to_xids(ev, ids, token->num_sids);
        NT_STATUS_NOT_OK_RETURN(status);
 
        g = token->num_sids;
@@ -128,7 +128,7 @@ NTSTATUS auth_session_info_fill_unix(struct wbc_context *wbc_ctx,
 {
        char *su;
        size_t len;
-       NTSTATUS status = security_token_to_unix_token(session_info, wbc_ctx,
+       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)) {
index b6da79064bb696fdc6038bd98a61260fc7cba735..3d5c438218c00195f45ea914f998b64172f98bc9 100644 (file)
@@ -157,7 +157,7 @@ static NTSTATUS nt_token_to_unix_security(struct ntvfs_module_context *ntvfs,
        struct unixuid_private *priv = ntvfs->private_data;
 
        return security_token_to_unix_token(req,
-                                           priv->wbc_ctx,
+                                           priv->wbc_ctx->event_ctx,
                                            token, sec);
 }