1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
From d5670219baefe6769a42984abb93e19d8a43dada 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 6e5b01670cd..67510b3e932 100644
--- a/usr.bin/rsync/receiver.c
+++ b/usr.bin/rsync/receiver.c
@@ -87,7 +87,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. */
@@ -148,7 +148,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.34.1
|
