diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-04-30 18:26:55 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-04-30 18:26:55 +0300 |
| commit | b07326d29e0df7a8f21aaadefebecbec8da20144 (patch) | |
| tree | 8e364fd3370e72676715058514ba00b00a5c82f4 | |
| parent | 37ab32da30a8bed7339fb1e9968bae53390a4622 (diff) | |
Use all ACEs from original ACL on Samba share
* security.cc (convert_samba_sd): Fix accidental dropping of all
non-Unix User, non-Unix Group accounts.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/security.cc | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 43bbbc1ae..414e14827 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2015-04-30 Corinna Vinschen <corinna@vinschen.de> + + * security.cc (convert_samba_sd): Fix accidental dropping of all + non-Unix User, non-Unix Group accounts. + 2015-04-27 Corinna Vinschen <corinna@vinschen.de> * include/asm/types.h: Add __s64 and __u64 types. diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc index 1bc0c5047..86ebe2c0a 100644 --- a/winsup/cygwin/security.cc +++ b/winsup/cygwin/security.cc @@ -1145,10 +1145,10 @@ convert_samba_sd (security_descriptor &sd_ret) if (gid < UNIX_POSIX_OFFSET && (grp = internal_getgrgid (gid))) ace_sid.getfromgr (grp); } - if (!add_access_allowed_ace (acl, i, ace->Mask, ace_sid, acl_len, - ace->Header.AceFlags)) - return; } + if (!add_access_allowed_ace (acl, i, ace->Mask, ace_sid, acl_len, + ace->Header.AceFlags)) + return; } acl->AclSize = acl_len; |