1From 6e087cd1f746eb636de0ec1769db6b4aac65e666 Mon Sep 17 00:00:00 2001
 2From: Michael Forney <mforney@mforney.org>
 3Date: Fri, 14 Jun 2019 12:42:15 -0700
 4Subject: [PATCH] rsync: Use standard S_ISVTX instead of S_ISTXT
 5
 6---
 7 usr.bin/rsync/receiver.c | 4 ++--
 8 1 file changed, 2 insertions(+), 2 deletions(-)
 9
10diff --git a/usr.bin/rsync/receiver.c b/usr.bin/rsync/receiver.c
11index 256a788b4f0..5dcc33b20fd 100644
12--- a/usr.bin/rsync/receiver.c
13+++ b/usr.bin/rsync/receiver.c
14@@ -87,7 +87,7 @@ rsync_set_metadata(struct sess *sess, int newfile,
15 				    "to user.group: %u.%u", f->path, uid, gid);
16 		} else
17 			LOG4("%s: updated uid and/or gid", f->path);
18-		mode &= ~(S_ISTXT | S_ISUID | S_ISGID);
19+		mode &= ~(S_ISVTX | S_ISUID | S_ISGID);
20 	}
21 
22 	/* Conditionally adjust file permissions. */
23@@ -149,7 +149,7 @@ rsync_set_metadata_at(struct sess *sess, int newfile, int rootfd,
24 				    "to user.group: %u.%u", f->path, uid, gid);
25 		} else
26 			LOG4("%s: updated uid and/or gid", f->path);
27-		mode &= ~(S_ISTXT | S_ISUID | S_ISGID);
28+		mode &= ~(S_ISVTX | S_ISUID | S_ISGID);
29 	}
30 
31 	/* Conditionally adjust file permissions. */
32-- 
332.49.0
34