diff options
| author | Kai Blin <kai@samba.org> | 2009-04-23 16:37:11 +0200 |
|---|---|---|
| committer | Kai Blin <kai@samba.org> | 2010-02-11 23:56:35 +0100 |
| commit | ea055e8c7905ec5d229fd5b50ca9ec8f60073b53 (patch) | |
| tree | 1fbb879a3bb2ff7b273c512dbec6e4b86b694521 /source4/ntvfs/posix/pvfs_acl_nfs4.c | |
| parent | 86d70ae94425c34fcb7cc7791a6e54b1a47f21cc (diff) | |
| download | samba-ea055e8c7905ec5d229fd5b50ca9ec8f60073b53.tar.gz samba-ea055e8c7905ec5d229fd5b50ca9ec8f60073b53.tar.bz2 samba-ea055e8c7905ec5d229fd5b50ca9ec8f60073b53.zip | |
s4: Switch to S3-style id mapping data types.
Diffstat (limited to 'source4/ntvfs/posix/pvfs_acl_nfs4.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_acl_nfs4.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source4/ntvfs/posix/pvfs_acl_nfs4.c b/source4/ntvfs/posix/pvfs_acl_nfs4.c index 02ed058af7..c6dbf79c57 100644 --- a/source4/ntvfs/posix/pvfs_acl_nfs4.c +++ b/source4/ntvfs/posix/pvfs_acl_nfs4.c @@ -39,7 +39,7 @@ static NTSTATUS pvfs_acl_load_nfs4(struct pvfs_state *pvfs, struct pvfs_filename struct nfs4acl *acl; struct security_descriptor *sd; int i, num_ids; - struct id_mapping *ids; + struct id_map *ids; struct composite_context *ctx; acl = talloc_zero(mem_ctx, struct nfs4acl); @@ -62,7 +62,7 @@ static NTSTATUS pvfs_acl_load_nfs4(struct pvfs_state *pvfs, struct pvfs_filename /* the number of ids to map is the acl count plus uid and gid */ num_ids = acl->a_count +2; - ids = talloc_array(sd, struct id_mapping, num_ids); + ids = talloc_array(sd, struct id_map, num_ids); NT_STATUS_HAVE_NO_MEMORY(ids); ids[0].unixid = talloc(ids, struct unixid); @@ -70,14 +70,14 @@ static NTSTATUS pvfs_acl_load_nfs4(struct pvfs_state *pvfs, struct pvfs_filename ids[0].unixid->id = name->st.st_uid; ids[0].unixid->type = ID_TYPE_UID; ids[0].sid = NULL; - ids[0].status = NT_STATUS_NONE_MAPPED; + ids[0].status = ID_UNKNOWN; ids[1].unixid = talloc(ids, struct unixid); NT_STATUS_HAVE_NO_MEMORY(ids[1].unixid); ids[1].unixid->id = name->st.st_gid; ids[1].unixid->type = ID_TYPE_GID; ids[1].sid = NULL; - ids[1].status = NT_STATUS_NONE_MAPPED; + ids[1].status = ID_UNKNOWN; for (i=0;i<acl->a_count;i++) { struct nfs4ace *a = &acl->ace[i]; @@ -90,7 +90,7 @@ static NTSTATUS pvfs_acl_load_nfs4(struct pvfs_state *pvfs, struct pvfs_filename ids[i+2].unixid->type = ID_TYPE_UID; } ids[i+2].sid = NULL; - ids[i+2].status = NT_STATUS_NONE_MAPPED; + ids[i+2].status = ID_UNKNOWN; } /* Allocate memory for the sids from the security descriptor to be on @@ -127,7 +127,7 @@ static NTSTATUS pvfs_acl_save_nfs4(struct pvfs_state *pvfs, struct pvfs_filename struct nfs4acl acl; int i; TALLOC_CTX *tmp_ctx; - struct id_mapping *ids; + struct id_map *ids; struct composite_context *ctx; tmp_ctx = talloc_new(pvfs); @@ -146,7 +146,7 @@ static NTSTATUS pvfs_acl_save_nfs4(struct pvfs_state *pvfs, struct pvfs_filename return NT_STATUS_NO_MEMORY; } - ids = talloc_array(tmp_ctx, struct id_mapping, acl.a_count); + ids = talloc_array(tmp_ctx, struct id_map, acl.a_count); if (ids == NULL) { talloc_free(tmp_ctx); return NT_STATUS_NO_MEMORY; @@ -160,7 +160,7 @@ static NTSTATUS pvfs_acl_save_nfs4(struct pvfs_state *pvfs, struct pvfs_filename talloc_free(tmp_ctx); return NT_STATUS_NO_MEMORY; } - ids[i].status = NT_STATUS_NONE_MAPPED; + ids[i].status = ID_UNKNOWN; } ctx = wbc_sids_to_xids_send(pvfs->wbc_ctx,ids, acl.a_count, ids); |