diff options
| author | brooks <brooks@FreeBSD.org> | 2013-01-31 16:04:40 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2013-01-31 16:04:40 +0000 |
| commit | 96dbcebea0dd37d6891a4dff6c621d8550f93769 (patch) | |
| tree | 124e6648e770fd1d9c50d81caf115d655a8efdc7 /usr.bin | |
| parent | b27d66677a42ee60c6e31598d42eca18fd6c6484 (diff) | |
| download | FreeBSD-src-96dbcebea0dd37d6891a4dff6c621d8550f93769.zip FreeBSD-src-96dbcebea0dd37d6891a4dff6c621d8550f93769.tar.gz | |
When in -U mode do avoid setting SUID bits, but do not modify the mode
variable so the intended mode can be logged correctly if -M is specified.
Sponsored by: DARPA, AFRL
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/xinstall/xinstall.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index a173873..15b115a 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -953,9 +953,8 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) } if (mode != (to_sb.st_mode & ALLPERMS)) { - if (dounpriv) - mode &= S_IRWXU|S_IRWXG|S_IRWXO; - if (fchmod(to_fd, mode)) { + if (fchmod(to_fd, + dounpriv ? mode & (S_IRWXU|S_IRWXG|S_IRWXO) : mode)) { serrno = errno; (void)unlink(to_name); errno = serrno; |
