Module: wine Branch: master Commit: f43d8b65c1e768ee5696ba8b7fda2c07059d2394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43d8b65c1e768ee5696ba8b7f...
Author: Rob Shearman rob@codeweavers.com Date: Sat Oct 6 14:31:25 2007 +0200
server: Remove an unnecessary check from file_set_fd.
---
server/file.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/server/file.c b/server/file.c index 3023f77..69d052c 100644 --- a/server/file.c +++ b/server/file.c @@ -406,10 +406,6 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd
assert( obj->ops == &file_ops );
- /* only DACL translation is currently supported */ - if (!(set_info & DACL_SECURITY_INFORMATION)) - return 1; - unix_fd = get_file_unix_fd( file );
if (unix_fd == -1) return 1; @@ -432,6 +428,8 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd else owner = token_get_user( current->process->token );
+ /* group and sacl not supported */ + /* keep the bits that we don't map to access rights in the ACL */ new_mode = file->mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG);