diff options
| author | Michael Sinatra <michael@burnttofu.net> | 2022-09-28 14:17:27 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2022-09-28 14:23:54 +0000 |
| commit | 78b484ed5d37d51a6d20491b348c42b457265385 (patch) | |
| tree | 3cc82e5e48b2126d11156a20d3ba919f83924a21 /dns/bind916/files/named.in | |
| parent | e629fd76022cf72d6c2bb35816fa8c082143172d (diff) | |
| download | ports-78b484ed5d37d51a6d20491b348c42b457265385.tar.gz ports-78b484ed5d37d51a6d20491b348c42b457265385.zip | |
dns/bind9*: fix some race condition in rc script
PR: 265994
MFH: yes
(cherry picked from commit 36ab384abd0413b0e3b9ef0c8e7f994eb03d456c)
Diffstat (limited to 'dns/bind916/files/named.in')
| -rw-r--r-- | dns/bind916/files/named.in | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/dns/bind916/files/named.in b/dns/bind916/files/named.in index 48681ca12f3b..6e225efe0733 100644 --- a/dns/bind916/files/named.in +++ b/dns/bind916/files/named.in @@ -311,6 +311,24 @@ rndc() named_prestart() { + # Is the user using a sandbox? + # + if [ -n "${named_chrootdir}" ]; then + rc_flags="${rc_flags} -t ${named_chrootdir}" + checkyesno named_chroot_autoupdate && chroot_autoupdate + + case "${altlog_proglist}" in + *named*) + ;; + *) + warn 'Using chroot without setting altlog_proglist, logging may not' + warn 'work correctly. Run sysrc altlog_proglist+=named' + ;; + esac + else + named_symlink_enable=NO + fi + find_pidfile find_sessionkeyfile @@ -346,24 +364,6 @@ named_prestart() local line nsip firstns - # Is the user using a sandbox? - # - if [ -n "${named_chrootdir}" ]; then - rc_flags="${rc_flags} -t ${named_chrootdir}" - checkyesno named_chroot_autoupdate && chroot_autoupdate - - case "${altlog_proglist}" in - *named*) - ;; - *) - warn 'Using chroot without setting altlog_proglist, logging may not' - warn 'work correctly. Run sysrc altlog_proglist+=named' - ;; - esac - else - named_symlink_enable=NO - fi - # Create an rndc.key file for the user if none exists # confgen_command="${_named_program_root}/sbin/rndc-confgen -a -b256 -u ${named_uid} \ |