server: Only check if permission bits changed before calling fchmod().

92352495 · Paul Chitescu · Alexandre Julliard · d1e592ad · 92352495 · 92352495
Commit 92352495 authored Dec 08, 2009 by Paul Chitescu Committed by Alexandre Julliard Dec 08, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

change.c server/change.c +1 -1

file.c server/file.c +1 -1

No files found.
--- a/server/change.c
+++ b/server/change.c
@@ -376,7 +376,7 @@ static int dir_set_sd( struct object *obj, const struct security_descriptor *sd,
        mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG);
        mode |= sd_to_mode( sd, owner );

-        if (st.st_mode != mode && fchmod( unix_fd, mode ) == -1)
+        if (((st.st_mode ^ mode) & (S_IRWXU|S_IRWXG|S_IRWXO)) && fchmod( unix_fd, mode ) == -1)
        {
            file_set_error();
            return 0;

--- a/server/file.c
+++ b/server/file.c
@@ -560,7 +560,7 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd
        mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX|S_IRWXG);
        mode |= sd_to_mode( sd, owner );

-        if (st.st_mode != mode && fchmod( unix_fd, mode ) == -1)
+        if (((st.st_mode ^ mode) & (S_IRWXU|S_IRWXG|S_IRWXO)) && fchmod( unix_fd, mode ) == -1)
        {
            file_set_error();
            return 0;