From 36d500e4258a8ae324df213e32d70e8d40b3d436 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 14 Aug 2015 21:55:42 +0200 Subject: [PATCH] Fix copy/paste error in previous patch * security.cc (convert_samba_sd): Fix copy/paste error in previous patch. Signed-off-by: Corinna Vinschen --- winsup/cygwin/ChangeLog | 7 ++++++- winsup/cygwin/security.cc | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 3c17f1495..274ec533d 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,9 +1,14 @@ +2015-08-14 Corinna Vinschen + + * security.cc (convert_samba_sd): Fix copy/paste error in previous + patch. + 2015-08-14 Corinna Vinschen * 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 diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc index 939dc35e0..5e771e257 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;