aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
diff options
context:
space:
mode:
authorKyle Evans <kevans@FreeBSD.org>2019-10-02 12:46:28 +0000
committerKyle Evans <kevans@FreeBSD.org>2019-10-02 12:46:28 +0000
commit0da4b4089c2432df878d507b466c3965f34eec7a (patch)
tree405555d2d849e96ac9689e007a5cc92026c77f3f /usr.sbin/mergemaster
parentbb2d815739d31dad60949d3b44d25fb4bf36526e (diff)
Notes
Diffstat (limited to 'usr.sbin/mergemaster')
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index d3163fa592c8a..486a957be842c 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -883,8 +883,7 @@ mm_install () {
/etc/mail/aliases)
NEED_NEWALIASES=yes
;;
- /usr/share/certs/trusted/*)
- /usr/share/certs/blacklisted/*)
+ /usr/share/certs/trusted/* | /usr/share/certs/blacklisted/*)
NEED_CERTCTL=yes
;;
/etc/login.conf)