ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Don't use the cached file mode when setting the security descriptor.

This commit is contained in:
Alexandre Julliard 2009-08-17 17:26:51 +02:00
parent 74a63029c7
commit da1784bb9e
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/change.c
View File

@ -342,6 +342,7 @@ static int dir_set_sd( struct object *obj, const struct security_descriptor *sd,
{ {
struct dir *dir = (struct dir *)obj; struct dir *dir = (struct dir *)obj;
const SID *owner; const SID *owner;
struct stat st;
mode_t mode; mode_t mode;
int unix_fd; int unix_fd;
@ -349,7 +350,7 @@ static int dir_set_sd( struct object *obj, const struct security_descriptor *sd,
unix_fd = get_dir_unix_fd( dir ); unix_fd = get_dir_unix_fd( dir );
if (unix_fd == -1) return 1; if (unix_fd == -1 || fstat( unix_fd, &st ) == -1) return 1;
if (set_info & OWNER_SECURITY_INFORMATION) if (set_info & OWNER_SECURITY_INFORMATION)
{ {
@ -372,18 +373,13 @@ static int dir_set_sd( struct object *obj, const struct security_descriptor *sd,
if (set_info & DACL_SECURITY_INFORMATION) if (set_info & DACL_SECURITY_INFORMATION)
{ {
/* keep the bits that we don't map to access rights in the ACL */ /* keep the bits that we don't map to access rights in the ACL */
mode = dir->mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG); mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG);
mode |= sd_to_mode( sd, owner ); mode |= sd_to_mode( sd, owner );
if (dir->mode != mode) if (st.st_mode != mode && fchmod( unix_fd, mode ) == -1)
{ {
if (fchmod( unix_fd, mode ) == -1) file_set_error();
{ return 0;
file_set_error();
return 0;
}
dir->mode = mode;
} }
} }
return 1; return 1;

16
server/file.c
View File

@ -535,6 +535,7 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd
{ {
struct file *file = (struct file *)obj; struct file *file = (struct file *)obj;
const SID *owner; const SID *owner;
struct stat st;
mode_t mode; mode_t mode;
int unix_fd; int unix_fd;
@ -542,7 +543,7 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd
unix_fd = get_file_unix_fd( file ); unix_fd = get_file_unix_fd( file );
if (unix_fd == -1) return 1; if (unix_fd == -1 || fstat( unix_fd, &st ) == -1) return 1;
if (set_info & OWNER_SECURITY_INFORMATION) if (set_info & OWNER_SECURITY_INFORMATION)
{ {
@ -567,18 +568,13 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd
if (set_info & DACL_SECURITY_INFORMATION) if (set_info & DACL_SECURITY_INFORMATION)
{ {
/* keep the bits that we don't map to access rights in the ACL */ /* keep the bits that we don't map to access rights in the ACL */
mode = file->mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG); mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG);
mode |= sd_to_mode( sd, owner ); mode |= sd_to_mode( sd, owner );
if (file->mode != mode) if (st.st_mode != mode && fchmod( unix_fd, mode ) == -1)
{ {
if (fchmod( unix_fd, mode ) == -1) file_set_error();
{ return 0;
file_set_error();
return 0;
}
file->mode = mode;
} }
} }
return 1; return 1;