summaryrefslogtreecommitdiff
path: root/source4/ntvfs/unixuid
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2009-04-23 16:37:11 +0200
committerKai Blin <kai@samba.org>2010-02-11 23:56:35 +0100
commitea055e8c7905ec5d229fd5b50ca9ec8f60073b53 (patch)
tree1fbb879a3bb2ff7b273c512dbec6e4b86b694521 /source4/ntvfs/unixuid
parent86d70ae94425c34fcb7cc7791a6e54b1a47f21cc (diff)
downloadsamba-ea055e8c7905ec5d229fd5b50ca9ec8f60073b53.tar.gz
samba-ea055e8c7905ec5d229fd5b50ca9ec8f60073b53.tar.bz2
samba-ea055e8c7905ec5d229fd5b50ca9ec8f60073b53.zip
s4: Switch to S3-style id mapping data types.
Diffstat (limited to 'source4/ntvfs/unixuid')
-rw-r--r--source4/ntvfs/unixuid/vfs_unixuid.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c b/source4/ntvfs/unixuid/vfs_unixuid.c
index 85c70d7dd1..f6b73d7473 100644
--- a/source4/ntvfs/unixuid/vfs_unixuid.c
+++ b/source4/ntvfs/unixuid/vfs_unixuid.c
@@ -172,7 +172,7 @@ static NTSTATUS nt_token_to_unix_security(struct ntvfs_module_context *ntvfs,
struct unixuid_private *priv = ntvfs->private_data;
int i;
NTSTATUS status;
- struct id_mapping *ids;
+ struct id_map *ids;
struct composite_context *ctx;
*sec = talloc(req, struct unix_sec_ctx);
@@ -181,16 +181,16 @@ static NTSTATUS nt_token_to_unix_security(struct ntvfs_module_context *ntvfs,
return NT_STATUS_ACCESS_DENIED;
}
- ids = talloc_array(req, struct id_mapping, token->num_sids);
+ ids = talloc_array(req, struct id_map, token->num_sids);
NT_STATUS_HAVE_NO_MEMORY(ids);
ids[0].unixid = NULL;
ids[0].sid = token->user_sid;
- ids[0].status = NT_STATUS_NONE_MAPPED;
+ ids[0].status = ID_UNKNOWN;
ids[1].unixid = NULL;
ids[1].sid = token->group_sid;
- ids[1].status = NT_STATUS_NONE_MAPPED;
+ ids[1].status = ID_UNKNOWN;
(*sec)->ngroups = token->num_sids - 2;
(*sec)->groups = talloc_array(*sec, gid_t, (*sec)->ngroups);
@@ -199,7 +199,7 @@ static NTSTATUS nt_token_to_unix_security(struct ntvfs_module_context *ntvfs,
for (i=0;i<(*sec)->ngroups;i++) {
ids[i+2].unixid = NULL;
ids[i+2].sid = token->sids[i+2];
- ids[i+2].status = NT_STATUS_NONE_MAPPED;
+ ids[i+2].status = ID_UNKNOWN;
}
ctx = wbc_sids_to_xids_send(priv->wbc_ctx, ids, token->num_sids, ids);