checkpath: add missing sticky/set*id mode bits to check

vapier · vapier · commit 6f444459586b · 2023-01-15T15:31:25.000-05:00
We incorrectly masked out the upper 3 bits when checking to see if the permissions need updating leading us to run chmod when not needed. Fixes #482.
diff --git a/src/checkpath/checkpath.c b/src/checkpath/checkpath.c
@@ -285,7 +285,7 @@ static int do_check(char *path, uid_t uid, gid_t gid, mode_t mode,
 			return -1;
 		}
 
-		if (mode && (st.st_mode & 0777) != mode) {
+		if (mode && (st.st_mode & 07777) != mode) {
 			if ((type != inode_dir) && (st.st_nlink > 1)) {
 				eerror("%s: chmod: Too many hard links to %s", applet, path);
 				close(readfd);

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ static int do_check(char *path, uid_t uid, gid_t gid, mode_t mode,`
`285`	`285`	`return -1;`
`286`	`286`	`}`
`287`	`287`
`288`		`- if (mode && (st.st_mode & 0777) != mode) {`
	`288`	`+ if (mode && (st.st_mode & 07777) != mode) {`
`289`	`289`	`if ((type != inode_dir) && (st.st_nlink > 1)) {`
`290`	`290`	`eerror("%s: chmod: Too many hard links to %s", applet, path);`
`291`	`291`	`close(readfd);`