diff options
| author | Cem Keylan <cem@ckyln.com> | 2020-10-16 17:41:25 +0300 |
|---|---|---|
| committer | Cem Keylan <cem@ckyln.com> | 2020-10-16 17:41:25 +0300 |
| commit | e2abcdca396661cbe0ae2ddb13d5c2b85682c13a (patch) | |
| tree | acf9b5c80b645617f882c45224c6e07251711842 /patches/0026-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch | |
| download | otools-e2abcdca396661cbe0ae2ddb13d5c2b85682c13a.tar.gz | |
initial commit
Diffstat (limited to 'patches/0026-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch')
| -rw-r--r-- | patches/0026-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/patches/0026-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch b/patches/0026-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch new file mode 100644 index 0000000..39bc650 --- /dev/null +++ b/patches/0026-rsync-Use-standard-S_ISVTX-instead-of-S_ISTXT.patch @@ -0,0 +1,34 @@ +From b8ea0a7fc75f79d89f9f225da1112f477419d0bd Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Fri, 14 Jun 2019 12:42:15 -0700 +Subject: [PATCH] rsync: Use standard S_ISVTX instead of S_ISTXT + +--- + usr.bin/rsync/receiver.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/usr.bin/rsync/receiver.c b/usr.bin/rsync/receiver.c +index 5ffd3458b74..51f9ddf6a5c 100644 +--- a/usr.bin/rsync/receiver.c ++++ b/usr.bin/rsync/receiver.c +@@ -86,7 +86,7 @@ rsync_set_metadata(struct sess *sess, int newfile, + "to user.group: %u.%u", f->path, uid, gid); + } else + LOG4("%s: updated uid and/or gid", f->path); +- mode &= ~(S_ISTXT | S_ISUID | S_ISGID); ++ mode &= ~(S_ISVTX | S_ISUID | S_ISGID); + } + + /* Conditionally adjust file permissions. */ +@@ -147,7 +147,7 @@ rsync_set_metadata_at(struct sess *sess, int newfile, int rootfd, + "to user.group: %u.%u", f->path, uid, gid); + } else + LOG4("%s: updated uid and/or gid", f->path); +- mode &= ~(S_ISTXT | S_ISUID | S_ISGID); ++ mode &= ~(S_ISVTX | S_ISUID | S_ISGID); + } + + /* Conditionally adjust file permissions. */ +-- +2.23.0 + |