MFC r270782:

  Restructure rc.d scripts for kerberos5 daemons:

  - Rename $kerberos5_server_enable with $kdc_enable and rename
    rc.d/kerberos with rc.d/kdc.

  - Rename $kadmin5_server_enable with $kadmind_enable.

  - Rename ${kerberos5,kpasswdd}_server with ${kdc,kpasswdd}_program.

  - Fix rc.d/{kadmind,kerberos,kpasswdd,kfd} scripts not to change variables
    after load_rc_config().

  - Add rc.d/ipropd_master and rc.d/ipropd_slave scripts.  These are
    for iprop-master(8) and iprop-slave(8).  Keytab used for iprop service is
    defined in ipropd_{master,slave}_keytab (/etc/krb5.keytab by default).

  - Add dependency on rc.d/kdc to SERVERS.  rc.d/kdc must be invoked as early
    as possible before scripts divided by rc.d/SERVERS.

  Note that changes to rc.d/{kdc,kpasswdd,kadmind} are backward-compatible
  with the old configuration variables:
  ${kerberos5,kpasswdd,kadmin5}_server{,_enable,_flags}.

1 files changed, 20 insertions, 7 deletions

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 1252611..7298999 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -277,15 +277,28 @@ local_unbound_enable="NO"	# local caching resolver
 #
 # kerberos. Do not run the admin daemons on slave servers
 #
-kerberos5_server_enable="NO"	# Run a kerberos 5 master server (or NO).
-kerberos5_server="/usr/libexec/kdc"	# path to kerberos 5 KDC
-kerberos5_server_flags="--detach"	# Additional flags to the kerberos 5 server
-kadmind5_server_enable="NO"	# Run kadmind (or NO)
-kadmind5_server="/usr/libexec/kadmind"	# path to kerberos 5 admin daemon
-kpasswdd_server_enable="NO"	# Run kpasswdd (or NO)
-kpasswdd_server="/usr/libexec/kpasswdd"	# path to kerberos 5 passwd daemon
+kdc_enable="NO"			# Run a kerberos 5 KDC (or NO).
+kdc_program="/usr/libexec/kdc"	# path to kerberos 5 KDC
+kdc_flags=""			# Additional flags to the kerberos 5 KDC
+kadmind_enable="NO"		# Run kadmind (or NO)
+kadmind_program="/usr/libexec/kadmind"	# path to kadmind
+kpasswdd_enable="NO"		# Run kpasswdd (or NO)
+kpasswdd_program="/usr/libexec/kpasswdd" # path to kpasswdd
 kfd_enable="NO"			# Run kfd (or NO)
 kfd_program="/usr/libexec/kfd"	# path to kerberos 5 kfd daemon
+kfd_flags=""
+ipropd_master_enable="NO"	# Run Heimdal incremental propagation daemon
+				# (master daemon).
+ipropd_master_program="/usr/libexec/ipropd-master"
+ipropd_master_flags=""		# Flags to ipropd-master.
+ipropd_master_keytab="/etc/krb5.keytab"	# keytab for ipropd-master.
+ipropd_master_slaves=""		# slave node names used for /var/heimdal/slaves.
+ipropd_slave_enable="NO"	# Run Heimdal incremental propagation daemon
+				# (slave daemon).
+ipropd_slave_program="/usr/libexec/ipropd-slave"
+ipropd_slave_flags=""		# Flags to ipropd-slave.
+ipropd_slave_keytab="/etc/krb5.keytab"	# keytab for ipropd-slave.
+ipropd_slave_masters=""		# master node names.
 
 gssd_enable="NO"		# Run the gssd daemon (or NO).
 gssd_program="/usr/sbin/gssd"	# Path to gssd.