summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2018-08-27 13:30:55 +0200
committerCorinna Vinschen <corinna@vinschen.de>2018-08-27 13:48:07 +0200
commitfcfcc288c4d3e9ad3bca4d0c9dd79ee1c88a99f9 (patch)
tree262e784fe2e719c084a1b8c0278b6cba10606a79
parent6706b19a974b10fc20234fc101ab7bf5f9563705 (diff)
downloadcygnal-fcfcc288c4d3e9ad3bca4d0c9dd79ee1c88a99f9.tar.gz
cygnal-fcfcc288c4d3e9ad3bca4d0c9dd79ee1c88a99f9.tar.bz2
cygnal-fcfcc288c4d3e9ad3bca4d0c9dd79ee1c88a99f9.zip
Cygwin: don't return valid acl entry type for unknown SID
cygpsid::get_id neglects to set the type to 0 (ACL_UNDEFINED_TAG in POSIX speak) if the SID can not be translated into a valid uid or gid. This in turn leads to incorrect handling of uid/gid -1 entries. Fix this by setting type to 0 if the id is unknown. Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
-rw-r--r--winsup/cygwin/sec_helper.cc12
1 files changed, 9 insertions, 3 deletions
diff --git a/winsup/cygwin/sec_helper.cc b/winsup/cygwin/sec_helper.cc
index a1d8cba05..373b1df02 100644
--- a/winsup/cygwin/sec_helper.cc
+++ b/winsup/cygwin/sec_helper.cc
@@ -169,10 +169,16 @@ cygpsid::get_id (BOOL search_grp, int *type, cyg_ldap *pldap)
}
else if ((pw = internal_getpwsid (*this, pldap)))
id = pw->pw_uid;
- if (id != ILLEGAL_UID && type)
- *type = USER;
+ if (id != ILLEGAL_UID)
+ {
+ if (type)
+ *type = USER;
+ return id;
+ }
}
- return id;
+ if (type)
+ *type = 0; /* undefined type */
+ return ILLEGAL_UID;
}
PWCHAR