mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
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. MFC after: 3 days
This commit is contained in:
parent
c26391f4dd
commit
9e9d3e134b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=365756
|
@ -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}
|
||||
|
|
Loading…
Reference in a new issue