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/fhandler_disk_file.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/fhandler_disk_file.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index aea390508..a44bfb8b6 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -347,8 +347,8 @@ fhandler_base::fstat_by_nfs_ea (struct stat *buf) the cache, try to fetch it from the configured RFC 2307 domain (see last comment in cygheap_domain_info::init() for more information) and add it to the mapping cache. */ - buf->st_uid = ugid_cache.get_uid (nfs_attr->uid); - buf->st_gid = ugid_cache.get_gid (nfs_attr->gid); + buf->st_uid = cygheap->ugid_cache.get_uid (nfs_attr->uid); + buf->st_gid = cygheap->ugid_cache.get_gid (nfs_attr->gid); if (buf->st_uid == ILLEGAL_UID) { uid_t map_uid = ILLEGAL_UID; @@ -358,7 +358,7 @@ fhandler_base::fstat_by_nfs_ea (struct stat *buf) map_uid = cldap.remap_uid (nfs_attr->uid); if (map_uid == ILLEGAL_UID) map_uid = MAP_UNIX_TO_CYGWIN_ID (nfs_attr->uid); - ugid_cache.add_uid (nfs_attr->uid, map_uid); + cygheap->ugid_cache.add_uid (nfs_attr->uid, map_uid); buf->st_uid = map_uid; } if (buf->st_gid == ILLEGAL_GID) @@ -370,7 +370,7 @@ fhandler_base::fstat_by_nfs_ea (struct stat *buf) map_gid = cldap.remap_gid (nfs_attr->gid); if (map_gid == ILLEGAL_GID) map_gid = MAP_UNIX_TO_CYGWIN_ID (nfs_attr->gid); - ugid_cache.add_gid (nfs_attr->gid, map_gid); + cygheap->ugid_cache.add_gid (nfs_attr->gid, map_gid); buf->st_gid = map_gid; } buf->st_rdev = makedev (nfs_attr->rdev.specdata1, |