aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2020-09-19 02:12:04 +0000
committerKyle Evans <kevans@FreeBSD.org>2020-09-19 02:12:04 +0000
commitfc5084447e8a2f91df944fd679d899a369793f0c (patch)
tree43fd8532802a0bdecca868109cc2587e2c1551e0
parent44033ea6040e9b765ba39ba4fda63e2ec8c41b29 (diff)
downloadsrc-fc5084447e8a2f91df944fd679d899a369793f0c.tar.gz
src-fc5084447e8a2f91df944fd679d899a369793f0c.zip
MFS r365891: certctl: fix unprivileged mode
The first issue was lack of quoting around INSTALLFLAGS, which set it incorrectly and produced an error on -M. The second issue was that we weren't actually doing the install in unprivileged mode, making it effectively useless. This was designed to pass through the proper metalog/unpriv flags to install(1), so just let it happen. Approved by: re (gjb)
Notes
Notes: svn path=/releng/12.2/; revision=365897
-rwxr-xr-xusr.sbin/certctl/certctl.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/certctl/certctl.sh b/usr.sbin/certctl/certctl.sh
index b687a7706041..f317064a6dfe 100755
--- a/usr.sbin/certctl/certctl.sh
+++ b/usr.sbin/certctl/certctl.sh
@@ -129,7 +129,7 @@ do_scan()
[ -d "$CPATH" ] || continue
echo "Scanning $CPATH for certificates..."
for CFILE in $(ls -1 "${CPATH}" | grep -Ee "${FILEPAT}"); do
- [ -e "$CPATH/$CFILE" -a $UNPRIV -eq 0 ] || continue
+ [ -e "$CPATH/$CFILE" ] || continue
[ $VERBOSE -gt 0 ] && echo "Reading $CFILE"
"$CFUNC" "$CPATH/$CFILE"
done
@@ -263,7 +263,7 @@ shift $(( $OPTIND - 1 ))
: ${METALOG:=${DESTDIR}/METALOG}
INSTALLFLAGS=
-[ $UNPRIV -eq 1 ] && INSTALLFLAGS=-U -M ${METALOG} -D ${DESTDIR}
+[ $UNPRIV -eq 1 ] && INSTALLFLAGS="-U -M ${METALOG} -D ${DESTDIR}"
: ${TRUSTPATH:=${DESTDIR}/usr/share/certs/trusted:${DESTDIR}/usr/local/share/certs:${DESTDIR}/usr/local/etc/ssl/certs}
: ${BLACKLISTPATH:=${DESTDIR}/usr/share/certs/blacklisted:${DESTDIR}/usr/local/etc/ssl/blacklisted}
: ${CERTDESTDIR:=${DESTDIR}/etc/ssl/certs}