diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-08-14 21:55:42 +0200 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-08-14 21:55:42 +0200 |
| commit | 36d500e4258a8ae324df213e32d70e8d40b3d436 (patch) | |
| tree | 3d3321970385da306d5afb12fdc13746da4657c4 /winsup/cygwin | |
| parent | 5de7f2e6c31c59942d9e1b410c9436a21d2a0e7b (diff) | |
| download | newlib-36d500e4258a8ae324df213e32d70e8d40b3d436.zip newlib-36d500e4258a8ae324df213e32d70e8d40b3d436.tar.gz newlib-36d500e4258a8ae324df213e32d70e8d40b3d436.tar.bz2 | |
Fix copy/paste error in previous patch
* security.cc (convert_samba_sd): Fix copy/paste error in previous
patch.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/cygwin')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/security.cc | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 3c17f14..274ec53 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,9 +1,14 @@ 2015-08-14 Corinna Vinschen <corinna@vinschen.de> + * security.cc (convert_samba_sd): Fix copy/paste error in previous + patch. + +2015-08-14 Corinna Vinschen <corinna@vinschen.de> + * fhandler_disk_file.cc (fhandler_base::fstat_by_nfs_ea): Only try to map user and group info per RFC2307 if account info is fetched from Windows account DB. - (convert_samba_sd): Ditto. + * security.cc (convert_samba_sd): Ditto. 2015-08-14 Corinna Vinschen <corinna@vinschen.de> diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc index 939dc35..5e771e2 100644 --- a/winsup/cygwin/security.cc +++ b/winsup/cygwin/security.cc @@ -1158,7 +1158,7 @@ convert_samba_sd (security_descriptor &sd_ret) if (uid < UNIX_POSIX_OFFSET && (pwd = internal_getpwuid (uid))) ace_sid.getfrompw (pwd); } - else if (sid_sub_auth (ace_sid, 0) == 1 /* group */ + else if (sid_sub_auth (ace_sid, 0) == 2 /* group */ && cygheap->pg.nss_grp_db ()) { struct group *grp; |