There's always a default value for named_conf now, so no need to
check for it, and espcially not for a wrong value. Noticed by: Stefan Bethke <stb@lassitu.de> Approved by: mat (maintainer)
This commit is contained in:
parent
d1169b184f
commit
fe8682b27c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=338989
@ -2,7 +2,7 @@
|
||||
|
||||
PORTNAME= bind96
|
||||
PORTVERSION= 9.6.3.2.ESV.R10
|
||||
PORTREVISION= 3
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= dns net ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_ISC}
|
||||
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
|
||||
|
@ -98,14 +98,7 @@ named_prestart()
|
||||
chown ${named_uid}:${named_uid} ${pidfile%/pid}
|
||||
fi
|
||||
|
||||
command_args="-u ${named_uid:=root}"
|
||||
|
||||
if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then
|
||||
case "$named_flags" in
|
||||
-c*|*' -c'*) ;; # No need to add it
|
||||
*) command_args="-c $named_conf $command_args" ;;
|
||||
esac
|
||||
fi
|
||||
command_args="-u ${named_uid:=root} -c $named_conf $command_args"
|
||||
|
||||
local line nsip firstns
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
PORTNAME= bind98
|
||||
PORTVERSION= 9.8.6
|
||||
PORTREVISION= 6
|
||||
PORTREVISION= 7
|
||||
CATEGORIES= dns net ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_ISC}
|
||||
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
|
||||
|
@ -98,14 +98,7 @@ named_prestart()
|
||||
chown ${named_uid}:${named_uid} ${pidfile%/pid}
|
||||
fi
|
||||
|
||||
command_args="-u ${named_uid:=root}"
|
||||
|
||||
if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then
|
||||
case "$named_flags" in
|
||||
-c*|*' -c'*) ;; # No need to add it
|
||||
*) command_args="-c $named_conf $command_args" ;;
|
||||
esac
|
||||
fi
|
||||
command_args="-u ${named_uid:=root} -c $named_conf $command_args"
|
||||
|
||||
local line nsip firstns
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
PORTNAME?= bind99
|
||||
PORTVERSION= 9.9.4
|
||||
PORTREVISION?= 7
|
||||
PORTREVISION?= 8
|
||||
CATEGORIES= dns net ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_ISC}
|
||||
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
|
||||
|
@ -98,14 +98,7 @@ named_prestart()
|
||||
chown ${named_uid}:${named_uid} ${pidfile%/pid}
|
||||
fi
|
||||
|
||||
command_args="-u ${named_uid:=root}"
|
||||
|
||||
if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then
|
||||
case "$named_flags" in
|
||||
-c*|*' -c'*) ;; # No need to add it
|
||||
*) command_args="-c $named_conf $command_args" ;;
|
||||
esac
|
||||
fi
|
||||
command_args="-u ${named_uid:=root} -c $named_conf $command_args"
|
||||
|
||||
local line nsip firstns
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user