etcupdate: Restrict access to the conflicts directory

In the window during conflict resolution, copies of installed files with
conflicts are added here with the default mode.  Restrict access.

PR:		277470
Reviewed by:	philip, jhb, emaste
Differential Revision:	https://reviews.freebsd.org/D48576

This commit is contained in:

Mark Johnston

2025-01-28 14:23:06 +00:00

parent 63efd7f5ac

commit c43ae7ab4b

1 changed files with 3 additions and 0 deletions

									
										usr.sbin/etcupdate/etcupdate.sh
									
		+3
		
												View File
												
				@@ -1611,6 +1611,9 @@ EOF

					# Initialize conflicts and warnings handling.

					rm -f $WARNINGS

					mkdir -p $CONFLICTS

					if ! chmod 0700 ${CONFLICTS}; then

						panic "Unable to set permissions on conflicts directory"

					fi

					# Ignore removed files for the pre-world case.  A pre-world

					# update uses a stripped-down tree.