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>
This commit is contained in:
Corinna Vinschen 2015-04-30 17:26:55 +02:00
parent 37ab32da30
commit b07326d29e
2 changed files with 8 additions and 3 deletions

View File

@ -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.

View File

@ -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;