View | Details | Raw Unified | Return to bug 278395 | Differences between
and this patch

Collapse All | Expand All

(-)b/libexec/rc/rc.conf (+2 lines)
Lines 330-335 resolv_enable="YES" # Enable resolv / resolvconf Link Here
330
kdc_enable="NO"			# Run a kerberos 5 KDC (or NO).
330
kdc_enable="NO"			# Run a kerberos 5 KDC (or NO).
331
kdc_program="/usr/libexec/kdc"	# path to kerberos 5 KDC
331
kdc_program="/usr/libexec/kdc"	# path to kerberos 5 KDC
332
kdc_flags=""			# Additional flags to the kerberos 5 KDC
332
kdc_flags=""			# Additional flags to the kerberos 5 KDC
333
kdc_restart="NO"		# Auto restart kdc on abnormal termination
334
kdc_restart_delay=""		# Auto restart delay seconds
333
kadmind_enable="NO"		# Run kadmind (or NO)
335
kadmind_enable="NO"		# Run kadmind (or NO)
334
kadmind_program="/usr/libexec/kadmind"	# path to kadmind
336
kadmind_program="/usr/libexec/kadmind"	# path to kadmind
335
kpasswdd_enable="NO"		# Run kpasswdd (or NO)
337
kpasswdd_enable="NO"		# Run kpasswdd (or NO)
(-)b/libexec/rc/rc.d/kdc (-3 / +27 lines)
Lines 12-26 Link Here
12
name=kdc
12
name=kdc
13
desc="Kerberos 5 server"
13
desc="Kerberos 5 server"
14
rcvar=${name}_enable
14
rcvar=${name}_enable
15
: ${kdc_restart:="NO"}
16
: ${kdc_restart_DELAY:="DEFAULT"}
15
17
16
set_rcvar_obsolete kerberos5_server_enable kdc_enable
18
set_rcvar_obsolete kerberos5_server_enable kdc_enable
17
set_rcvar_obsolete kerberos5_server kdc_program
19
set_rcvar_obsolete kerberos5_server kdc_program
18
set_rcvar_obsolete kerberos5_server_flags kdc_flags
20
set_rcvar_obsolete kerberos5_server_flags kdc_flags
19
21
20
21
load_rc_config $name
22
load_rc_config $name
22
if [ "${kdc_program}" = /usr/libexec/kdc -o \
23
if [ "${kdc_program}" = /usr/libexec/kdc -o \
23
     "${kdc_program}" = /usr/local/libexec/kdc ]; then
24
     "${kdc_program}" = /usr/local/libexec/kdc ]; then
24
	command_args="$command_args --detach"
25
	detach="--detach"
26
	flavor=heimdal
27
else
28
	flavor=mit
29
	unset detach
25
fi
30
fi
31
32
case ${kdc_restart} in
33
[Yy][Ee][Ss])
34
	if [ "$flavor" = mit ]; then
35
		detach=-n
36
	else
37
		unset detach
38
	fi
39
	case ${kdc_restart_delay} in
40
	"")	unset daemon_restart_delay;;
41
	*)	daemon_restart_delay="-R ${kdc_restart_delay};;
42
	esac
43
	command_args="-r ${daemon_restart_delay} ${kdc_program} ${detach} ${command_args}"
44
	kdc_program=/usr/sbin/daemon
45
	;;
46
*)
47
	command_args="${detach} ${command_args}"
48
	;;
49
esac
50
26
run_rc_command "$1"
51
run_rc_command "$1"
27
- 

Return to bug 278395