diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-05-24 10:16:34 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-05-24 23:08:56 +1000 |
| commit | 285647664cf60baa9f8f1a52bea0c55aa01b4e85 (patch) | |
| tree | b86e569733a2c0fe8b56f675bd6acfc350d08b88 /source4/ntvfs/unixuid | |
| parent | 974ed9cf2c10ab3384c1070c22f5cd42908c95f1 (diff) | |
| download | samba-285647664cf60baa9f8f1a52bea0c55aa01b4e85.tar.gz samba-285647664cf60baa9f8f1a52bea0c55aa01b4e85.tar.bz2 samba-285647664cf60baa9f8f1a52bea0c55aa01b4e85.zip | |
s4:idmap Adjust code to new idmap structure names and layout.
Andrew Bartlett
Diffstat (limited to 'source4/ntvfs/unixuid')
| -rw-r--r-- | source4/ntvfs/unixuid/vfs_unixuid.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c b/source4/ntvfs/unixuid/vfs_unixuid.c index f6b73d7473..c80c52cc7d 100644 --- a/source4/ntvfs/unixuid/vfs_unixuid.c +++ b/source4/ntvfs/unixuid/vfs_unixuid.c @@ -184,11 +184,11 @@ static NTSTATUS nt_token_to_unix_security(struct ntvfs_module_context *ntvfs, ids = talloc_array(req, struct id_map, token->num_sids); NT_STATUS_HAVE_NO_MEMORY(ids); - ids[0].unixid = NULL; + ZERO_STRUCT(ids[0].xid); ids[0].sid = token->user_sid; ids[0].status = ID_UNKNOWN; - ids[1].unixid = NULL; + ZERO_STRUCT(ids[1].xid); ids[1].sid = token->group_sid; ids[1].status = ID_UNKNOWN; @@ -197,7 +197,7 @@ static NTSTATUS nt_token_to_unix_security(struct ntvfs_module_context *ntvfs, NT_STATUS_HAVE_NO_MEMORY((*sec)->groups); for (i=0;i<(*sec)->ngroups;i++) { - ids[i+2].unixid = NULL; + ZERO_STRUCT(ids[i+2].xid); ids[i+2].sid = token->sids[i+2]; ids[i+2].status = ID_UNKNOWN; } @@ -208,24 +208,24 @@ static NTSTATUS nt_token_to_unix_security(struct ntvfs_module_context *ntvfs, status = wbc_sids_to_xids_recv(ctx, &ids); NT_STATUS_NOT_OK_RETURN(status); - if (ids[0].unixid->type == ID_TYPE_BOTH || - ids[0].unixid->type == ID_TYPE_UID) { - (*sec)->uid = ids[0].unixid->id; + if (ids[0].xid.type == ID_TYPE_BOTH || + ids[0].xid.type == ID_TYPE_UID) { + (*sec)->uid = ids[0].xid.id; } else { return NT_STATUS_INVALID_SID; } - if (ids[1].unixid->type == ID_TYPE_BOTH || - ids[1].unixid->type == ID_TYPE_GID) { - (*sec)->gid = ids[1].unixid->id; + if (ids[1].xid.type == ID_TYPE_BOTH || + ids[1].xid.type == ID_TYPE_GID) { + (*sec)->gid = ids[1].xid.id; } else { return NT_STATUS_INVALID_SID; } for (i=0;i<(*sec)->ngroups;i++) { - if (ids[i+2].unixid->type == ID_TYPE_BOTH || - ids[i+2].unixid->type == ID_TYPE_GID) { - (*sec)->groups[i] = ids[i+2].unixid->id; + if (ids[i+2].xid.type == ID_TYPE_BOTH || + ids[i+2].xid.type == ID_TYPE_GID) { + (*sec)->groups[i] = ids[i+2].xid.id; } else { return NT_STATUS_INVALID_SID; } |