diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-02-27 17:03:29 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-02-27 17:03:29 +0300 |
| commit | 211cb4df18970873659130afe13934139a655c0d (patch) | |
| tree | dd6b42f00e9fe44f557dcf293c24530498d08f1d | |
| parent | 06371539bd405ce4ba288d44efaaeb645ed37299 (diff) | |
* uinfo.cc (pwdgrp::fetch_account_from_windows): Drop redundant test
for SidTypeUser.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/uinfo.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 156680638..9206aabba 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2015-02-27 Corinna Vinschen <corinna@vinschen.de> + * uinfo.cc (pwdgrp::fetch_account_from_windows): Drop redundant test + for SidTypeUser. + +2015-02-27 Corinna Vinschen <corinna@vinschen.de> + * sec_acl.cc (setacl): Fix bug which leads to ACE duplication in case owner SID == group SID. (getacl): Reverse order of SID test against group or owner sid to diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc index 12d89a941..d9ce9028a 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc @@ -2053,7 +2053,7 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap) switch (acc_type) { case SidTypeUser: - if (is_group () && acc_type == SidTypeUser) + if (is_group ()) { /* Don't allow users as group. While this is technically possible, it doesn't make sense in a POSIX scenario. |