===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.45
retrieving revision 1.48
diff -u -r1.45 -r1.48
--- openbsd/fw_update/fw_install.sh	2021/12/02 03:44:19	1.45
+++ openbsd/fw_update/fw_install.sh	2021/12/02 03:50:03	1.48
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.45 2021/12/02 03:44:19 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.48 2021/12/02 03:50:03 afresh1 Exp $
 set -e
 
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
@@ -21,7 +21,7 @@
 	echo "${DESTDIR}/tmp"
 }
 
-# tmpdir, do_as, unpriv, and unpriv2 are from install.sub
+# tmpdir, do_as, and unpriv are from install.sub
 # modified to use su(1) when not in the installer.
 # modified to use mktemp(1) when not in the installer.
 
@@ -35,7 +35,7 @@
 
 	if [[ -e /usr/bin/mktemp ]]; then
 		_dir=$( /usr/bin/mktemp -d $1 )
-		chown _sndio "$_dir"
+		chown _file "$_dir"
 	else
 		until _dir="${1%-+(X)}.$_i.$RANDOM" && mkdir -- "$_dir" 2>/dev/null; do
 		    ((++_i < 10000)) || return 1
@@ -86,10 +86,6 @@
 }
 
 unpriv() {
-	do_as _sndio "$@"
-}
-
-unpriv2() {
 	do_as _file "$@"
 }
 
@@ -152,7 +148,7 @@
 		done
 
 		# Create a download directory for the firmware and
-		# check that the _sndio user can read files from
+		# check that the _file user can read files from
 		# it. Otherwise cleanup and skip the filesystem.
 		if _tmpsrc=$(tmpdir "$_tmpfs/firmware-XXXXXXXXX"); then
 			(
@@ -175,8 +171,7 @@
 	    echo "Cannot fetch SHA256.sig" >&2 && return 1
 
 	# Verify signature file with public keys.
-	! $_unpriv -f "$_cfile" \
-	    signify -Vep $FWPUB_KEY -x "$_cfile.sig" -m "$_cfile" &&
+	! signify -Vep $FWPUB_KEY -x "$_cfile.sig" -m "$_cfile" &&
 	    echo "Signature check of SHA256.sig failed" >&2 && return 1
 
 	for _d in $_drivers; do
@@ -201,8 +196,8 @@
 		# sha256. Create a flag file in case ftp failed. Firmware
 		# from net is written to the prefetch area.
 		( $_unpriv ftp -D "$_t" -Vmo - "$_src/$_f" || >/tmp/fail ) |
-		( $_srclocal && unpriv2 sha256 -b >/tmp/h ||
-		    unpriv2 -f /tmp/h sha256 -bph /tmp/h >"$_tmpsrc/$_f" )
+		( $_srclocal && sha256 -b >/tmp/h ||
+		    sha256 -bph /tmp/h >"$_tmpsrc/$_f" )
 
 		# Handle failed transfer.
 		if [[ -f /tmp/fail ]]; then