diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2015-08-31 10:06:27 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-08-31 10:06:27 +0000 |
| commit | 6c84a7b49475af72b176f8532cd2f0a5b08a3e51 (patch) | |
| tree | 316971eced9a762b30fb74ce2919a00bf983e976 /dns/bind910 | |
| parent | ba5b16df28e78f5716504ccab0dd5a322ea44fae (diff) | |
| download | ports-6c84a7b49475af72b176f8532cd2f0a5b08a3e51.tar.gz ports-6c84a7b49475af72b176f8532cd2f0a5b08a3e51.zip | |
When not using OpenSSL from ports, do not try to unmount the chrooted
engines directory.
PR: 201423 (based on)
Submitted by: girgen
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=395660
Diffstat (limited to 'dns/bind910')
| -rw-r--r-- | dns/bind910/Makefile | 2 | ||||
| -rw-r--r-- | dns/bind910/files/named.in | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile index 312b2a0eb313..cf13e711c1b0 100644 --- a/dns/bind910/Makefile +++ b/dns/bind910/Makefile @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/} PORTREVISION= 0 .else # dns/bind910 here -PORTREVISION= 1 +PORTREVISION= 2 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} diff --git a/dns/bind910/files/named.in b/dns/bind910/files/named.in index cd809f5173c9..5d5f92b45f84 100644 --- a/dns/bind910/files/named.in +++ b/dns/bind910/files/named.in @@ -232,10 +232,10 @@ named_stop() named_poststop() { if [ -n "${named_chrootdir}" -a -c ${named_chrootdir}/dev/null ]; then - # unmount OpenSSL engines, if they were not mounted but only - # copied, do nothing. - if [ `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 ]; then - umount ${named_chrootdir}${_openssl_engines} + # if using OpenSSL from ports, unmount OpenSSL engines, if they + # were not mounted but only copied, do nothing. + if [ -d ${_openssl_engines} -a \( `${SYSCTL_N} security.jail.jailed` -eq 0 -o `${SYSCTL_N} security.jail.mount_allowed` -eq 1 \) ]; then + umount ${named_chrootdir}${_openssl_engines} fi # unmount /dev if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then |