summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2019-06-19 10:58:48 +0000
committerjperkin <jperkin@pkgsrc.org>2019-06-19 10:58:48 +0000
commitffa7ecccd419893272aea9a78f28383c055c1f4a (patch)
tree1dfdf856e162ee8a7b90e22e8cf9da7c4b984d0f
parent160f957e289261fad81aa30db0e968380e1ffc39 (diff)
downloadpkgsrc-ffa7ecccd419893272aea9a78f28383c055c1f4a.tar.gz
bind*: Fix a couple of issues in the SMF method.
Fix a typo in the configuration_file arguments, joyent/pkgsrc#189. Ensure the /var/run/named directory has the correct permissions.
-rw-r--r--net/bind911/files/smf/named.sh4
-rw-r--r--net/bind912/files/smf/named.sh4
-rw-r--r--net/bind914/files/smf/named.sh4
3 files changed, 6 insertions, 6 deletions
diff --git a/net/bind911/files/smf/named.sh b/net/bind911/files/smf/named.sh
index cd5fa25e5f2..172829088bc 100644
--- a/net/bind911/files/smf/named.sh
+++ b/net/bind911/files/smf/named.sh
@@ -111,7 +111,7 @@ get_config ()
;;
'configuration_file')
cmdopts="${cmdopts} -c ${value}"
- checkopts="${checkopts} -t ${value}"
+ checkopts="${checkopts} ${value}"
configuration_file=${value};
;;
'server')
@@ -202,7 +202,7 @@ case "$method" in
rndc_key_file=${chroot_dir}${rndc_key_file}
rndc_cmd_opts="${rndc_cmd_opts} -t ${chroot_dir}"
else
- mkdir -p @VARBASE@/run/named
+ mkdir -p -m 0770 @VARBASE@/run/named
chown ${cmduser}:${cmduser} @VARBASE@/run/named
fi
diff --git a/net/bind912/files/smf/named.sh b/net/bind912/files/smf/named.sh
index cd5fa25e5f2..172829088bc 100644
--- a/net/bind912/files/smf/named.sh
+++ b/net/bind912/files/smf/named.sh
@@ -111,7 +111,7 @@ get_config ()
;;
'configuration_file')
cmdopts="${cmdopts} -c ${value}"
- checkopts="${checkopts} -t ${value}"
+ checkopts="${checkopts} ${value}"
configuration_file=${value};
;;
'server')
@@ -202,7 +202,7 @@ case "$method" in
rndc_key_file=${chroot_dir}${rndc_key_file}
rndc_cmd_opts="${rndc_cmd_opts} -t ${chroot_dir}"
else
- mkdir -p @VARBASE@/run/named
+ mkdir -p -m 0770 @VARBASE@/run/named
chown ${cmduser}:${cmduser} @VARBASE@/run/named
fi
diff --git a/net/bind914/files/smf/named.sh b/net/bind914/files/smf/named.sh
index cd5fa25e5f2..47b1ea25313 100644
--- a/net/bind914/files/smf/named.sh
+++ b/net/bind914/files/smf/named.sh
@@ -111,7 +111,7 @@ get_config ()
;;
'configuration_file')
cmdopts="${cmdopts} -c ${value}"
- checkopts="${checkopts} -t ${value}"
+ checkopts="${checkopts} ${value}"
configuration_file=${value};
;;
'server')
@@ -202,7 +202,7 @@ case "$method" in
rndc_key_file=${chroot_dir}${rndc_key_file}
rndc_cmd_opts="${rndc_cmd_opts} -t ${chroot_dir}"
else
- mkdir -p @VARBASE@/run/named
+ mkdir -p 0770 @VARBASE@/run/named
chown ${cmduser}:${cmduser} @VARBASE@/run/named
fi