summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/security.cc
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2015-04-30 12:08:20 +0200
committerCorinna Vinschen <corinna@vinschen.de>2015-04-30 12:08:20 +0200
commit17a6effb5fd60ec23f156bbed9d841e1fd94e9b3 (patch)
treea2d78d09c9f8d98fe1660d548bf526b601b4a8c5 /winsup/cygwin/security.cc
parentf737914dd6b26612b1db26950e267f5589cb21bb (diff)
downloadcygnal-17a6effb5fd60ec23f156bbed9d841e1fd94e9b3.tar.gz
cygnal-17a6effb5fd60ec23f156bbed9d841e1fd94e9b3.tar.bz2
cygnal-17a6effb5fd60ec23f156bbed9d841e1fd94e9b3.zip
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>
Diffstat (limited to 'winsup/cygwin/security.cc')
-rw-r--r--winsup/cygwin/security.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc
index 5fca6746e..bee9b06ae 100644
--- a/winsup/cygwin/security.cc
+++ b/winsup/cygwin/security.cc
@@ -677,10 +677,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, ace->Mask, ace_sid, acl_len,
- ace->Header.AceFlags))
- return;
}
+ if (!add_access_allowed_ace (acl, ace->Mask, ace_sid, acl_len,
+ ace->Header.AceFlags))
+ return;
}
acl->AclSize = acl_len;