Date: Sat, 19 Sep 2020 02:12:04 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r365897 - releng/12.2/usr.sbin/certctl Message-ID: <202009190212.08J2C41C081532@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Sat Sep 19 02:12:04 2020 New Revision: 365897 URL: https://svnweb.freebsd.org/changeset/base/365897 Log: 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) Modified: releng/12.2/usr.sbin/certctl/certctl.sh Directory Properties: releng/12.2/ (props changed) Modified: releng/12.2/usr.sbin/certctl/certctl.sh ============================================================================== --- releng/12.2/usr.sbin/certctl/certctl.sh Sat Sep 19 01:59:17 2020 (r365896) +++ releng/12.2/usr.sbin/certctl/certctl.sh Sat Sep 19 02:12:04 2020 (r365897) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009190212.08J2C41C081532>