View | Details | Raw Unified | Return to bug 199384
Collapse All | Expand All

(-)files/named.in (-2 / +13 lines)
Lines 62-67 Link Here
62
_named_program_root="${named_program%/sbin/named}"
62
_named_program_root="${named_program%/sbin/named}"
63
_openssl_engines="%%LOCALBASE%%/lib/engines"
63
_openssl_engines="%%LOCALBASE%%/lib/engines"
64
64
65
# Needed if named.conf and rndc.conf are moved or if rndc.conf is used
66
rndc_conf=${rndc_conf:-"$_named_confdir/rndc.conf"}
67
rndc_key=${rndc_key:-"$_named_confdir/rndc.key"}
68
if [ -s $rndc_conf ] ; then
69
    rndc_flags=${rndc_flags:-"-c $rndc_conf"}
70
elif [ -s $rndc_key ] ; then
71
    rndc_flags=${rndc_flags:-"-k $rndc_key"}
72
else
73
    rndc_flags=${rndc_flags:-""}
74
fi
75
65
# If running in a chroot cage, ensure that the appropriate files
76
# If running in a chroot cage, ensure that the appropriate files
66
# exist inside the cage, as well as helper symlinks into the cage
77
# exist inside the cage, as well as helper symlinks into the cage
67
# from outside.
78
# from outside.
Lines 187-193 Link Here
187
{
198
{
188
	# This is a one line function, but ${named_program} is not defined early
199
	# This is a one line function, but ${named_program} is not defined early
189
	# enough to be there when the reload_cmd variable is defined up there.
200
	# enough to be there when the reload_cmd variable is defined up there.
190
	${_named_program_root}/sbin/rndc reload
201
	${_named_program_root}/sbin/rndc $rndc_flags reload
191
}
202
}
192
203
193
find_pidfile()
204
find_pidfile()
Lines 213-219 Link Here
213
		return 1
224
		return 1
214
	fi
225
	fi
215
	echo 'Stopping named.'
226
	echo 'Stopping named.'
216
	if ${_named_program_root}/sbin/rndc stop 2>/dev/null; then
227
	if ${_named_program_root}/sbin/rndc $rndc_flags stop 2>/dev/null; then
217
		wait_for_pids ${rc_pid}
228
		wait_for_pids ${rc_pid}
218
	else
229
	else
219
		echo -n 'rndc failed, trying kill: '
230
		echo -n 'rndc failed, trying kill: '

Return to bug 199384