diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2014-02-11 11:51:29 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2014-02-11 11:51:29 +0000 |
| commit | 7fa5cbbfcdb4ff064ccc17d7fb514d3ff1ad8d2d (patch) | |
| tree | c4e396629da24101629123b291c579a71e220415 /winsup/cygwin/sec_helper.cc | |
| parent | 026a2445d17e937996ae582f6875fb66b6ac7186 (diff) | |
| download | cygnal-7fa5cbbfcdb4ff064ccc17d7fb514d3ff1ad8d2d.tar.gz cygnal-7fa5cbbfcdb4ff064ccc17d7fb514d3ff1ad8d2d.tar.bz2 cygnal-7fa5cbbfcdb4ff064ccc17d7fb514d3ff1ad8d2d.zip | |
* autoload.cc (NetLocalGroupGetInfo): Replace NetGroupGetInfo.
* cygheap.h (class cygheap_ugid_cache): Move ugid_cache_t type here
and rename.
(struct init_cygheap): Add cygheap_ugid_cache member "ugid_cache".
* pwdgrp.h (class ugid_cache_t): Remove here.
* fhandler_disk_file.cc (fhandler_base::fstat_by_nfs_ea): Accommodate
move of ugid_cache to cygheap.
* sec_helper.cc (get_sids_info): Ditto.
* uinfo.cc (ugid_cache): Remove.
(pwdgrp::fetch_account_from_windows): Define id_val globally.
Move SidTypeAlias handling into SidTypeUser/SidTypeGroup branch since
aliases are handled like groups in SAM. Accommodate move of ugid_cache
to cygheap. Consolidate code reading SAM comments into a single branch
for both, SidTypeUser and SidTypeAlias. For SidTypeAlias, fix thinko
and call NetLocalGroupGetInfo rather than NetGroupGetInfo. Simplify
code setting Cygwin primary group for SAM accounts. Add code to handle
UNIX uid/gid from SAM comment.
Diffstat (limited to 'winsup/cygwin/sec_helper.cc')
| -rw-r--r-- | winsup/cygwin/sec_helper.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/winsup/cygwin/sec_helper.cc b/winsup/cygwin/sec_helper.cc index 8aeac2e5b..8a31693f1 100644 --- a/winsup/cygwin/sec_helper.cc +++ b/winsup/cygwin/sec_helper.cc @@ -314,7 +314,7 @@ get_sids_info (cygpsid owner_sid, cygpsid group_sid, uid_t * uidret, gid_t * gid last comment in cygheap_domain_info::init() for more information) and add it to the mapping cache. */ gid_t gid = sid_sub_auth_rid (group_sid); - gid_t map_gid = ugid_cache.get_gid (gid); + gid_t map_gid = cygheap->ugid_cache.get_gid (gid); if (map_gid == ILLEGAL_GID) { domain = cygheap->dom.get_rfc2307_domain (); @@ -322,7 +322,7 @@ get_sids_info (cygpsid owner_sid, cygpsid group_sid, uid_t * uidret, gid_t * gid map_gid = cldap.remap_gid (gid); if (map_gid == ILLEGAL_GID) map_gid = MAP_UNIX_TO_CYGWIN_ID (gid); - ugid_cache.add_gid (gid, map_gid); + cygheap->ugid_cache.add_gid (gid, map_gid); } *gidret = map_gid; } @@ -343,7 +343,7 @@ get_sids_info (cygpsid owner_sid, cygpsid group_sid, uid_t * uidret, gid_t * gid { /* Samba UNIX user. See comment above. */ uid_t uid = sid_sub_auth_rid (owner_sid); - uid_t map_uid = ugid_cache.get_uid (uid); + uid_t map_uid = cygheap->ugid_cache.get_uid (uid); if (map_uid == ILLEGAL_UID) { domain = cygheap->dom.get_rfc2307_domain (); @@ -351,7 +351,7 @@ get_sids_info (cygpsid owner_sid, cygpsid group_sid, uid_t * uidret, gid_t * gid map_uid = cldap.remap_uid (uid); if (map_uid == ILLEGAL_UID) map_uid = MAP_UNIX_TO_CYGWIN_ID (uid); - ugid_cache.add_uid (uid, map_uid); + cygheap->ugid_cache.add_uid (uid, map_uid); } *uidret = map_uid; } |