MFS r272855, 266846:

  - Do not override sin6_scope_id in LLA when it is already set to non-zero.
    This fixes destination list in output of netstat -r.
  - Plug a memory leak.
  - Add RTM_VERSION check.
  - Fix a bug which can make sysctl() fail when -F is specified.
  - Increase WID_IF_DEFAULT() from 6 to 8 (the default for AF_INET6) because
    we have interfaces with longer names than 6 chars like epairN{a,b}.
  - Style fixes.

MFS r272847:

  - Add rwlock to struct dadq.  A panic could occur when a large number of
    addresses performed DAD at the same time.

MFS r272850:

  - Replace Sun RPC license in TI-RPC library with a 3-clause BSD license,
    with the explicit permission of Sun Microsystems in 2009.

  - Replace Sun Industry Standards Source License for Sun RPC code with a
    3-clause BSD license as specified by Oracle America, Inc. in 2010.
    This license change was approved by Wim Coekaerts, Senior Vice
    President, Linux and Virtualization at Oracle Corporation.

  - Replace Sun RPC license with a 3-clause BSD license.  This license change
    was approved in 2010 by Wim Coekaerts, Senior Vice President, Linux and
    Virtualization at Oracle Corporation.

  - Replace Sun RPC license for TI-RPC library with a 3-clause BSD license,
    with the explicit permission of Sun Microsystems in 2009.
    The code in question in this file was copied from
    lib/libc/rpc/pmap_getport.c.

MFS r272852,r272853:

  - Add relative specification in expiration time.
  - Add proto3 option for RTF_PROTO3.
  - Use %lu for members of struct rt_metrics.
  - Use long explicitly for the time difference.

MFS r272854:

  -  Return 0 if:

      1. "-u N" specified, no -f, and mdN found,
      2. no -u, "-f /pathname" specified, and mdN associated with
         /pathname found,
      3. "-u N" specified, "-f /pathname" specified, and both of them found,
      4. "-l" specified and no -f,
      5. "-l" specified, "-f /pathname" specified, and /pathname found.

    otherwise return -1.

MFS r272856:

  - Move configuration of IPv6 NDP flags to a point before handling ifconfig_IF.
    This fixes a race that a non-IPv4 interface can get an EUI64 LLA even if it
    has IFDISABLED nd6 flag at boot time.

MFS r272857:

  - Cancel DAD for an ifa when the ifp has ND6_IFF_IFDISABLED as early as
    possible and do not clear IN6_IFF_TENTATIVE.  If IFDISABLED was accidentally
    set after a DAD started, TENTATIVE could be cleared because no NA was
    received due to IFDISABLED, and as a result it could prevent DAD when
    manually clearing IFDISABLED after that.

MFS r272858:

  - Fix an issue in range specification handling when a "-foo" is specified in
    ifconfig_IF_aliasN.

MFS r272859:

  - Fix EtherIP.  TOS field must be initialized when the inner protocol is
    PF_LINK, and multicast/broadcast flag should always be dropped because
    the outer protocol uses unicast even when the inner address is not for
    unicast.  It had been broken since r236951 when gif_output() started to
    use IFQ_HANDOFF().

MFS r272860:

  - Recover sin6_scope_id of gateway addresses in riprecv() by using the
    if_index where a RIP packet was received.  This fixes a bug which
    prevented gateway addresses in fe80::/64 from being added.

MFS r272861:

  - Fix rc.d/gssd script to define the default values in a standard way.
  - Use a parameter argument in jls(8) instead of doing grep.

MFS r272862, r272870:

  - Restructure rc.d scripts for kerberos5 daemons.

MFS r272863:

  - Return false status only when adding a route is failed.  It could
    erroneously return false due to an afexists() check loop in routing_start().

MFS r272864:

  - Use ipv6_prefer when at least one ifconfig_IF_ipv6 is configured.

MFS r272865:

  - Fix a bug which prevented mount.fstab parameter from being converted
    when jail_JID_devfs_enable=NO.

MFS r272866:

  -  Fix header output when -P is specified and (ncpus - 1) != maxid.

MFS r272867:

  - Fix a bug which could break extended attributes in a dump output.
    This occurred when a file was >892kB long and had a large data (>1kB)
    in the extended attributes.

MFS r272868, r272869:

  - Make net.inet.ip.sourceroute, net.inet.ip.accept_sourceroute, and
    net.inet.ip.process_options vnet-aware.

MFS r272871:

  - Revert changes in r269180.  It could cause -c N option to enter an
    infinite loop if no reply packet is received.

MFS r272874:

  - Resurrect set_rcvar() as a function to define a rc.conf variable.
    It defines a variable and its default value in load_rc_config() just after
    rc.conf is loaded.  "rcvar" command shows the current and the default
    values.

MFS r272960:

  - Do not add late flag when file= is specified because it has a bad
    side-effect.  The specified file should exist before the fstab line.

Approved by:	re (gjb)

1 files changed, 21 insertions, 7 deletions

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 1a7bc8e..c634c26 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -277,17 +277,31 @@ 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_master=""		# master node name.
 
 gssd_enable="NO"		# Run the gssd daemon (or NO).
+gssd_program="/usr/sbin/gssd"	# Path to gssd.
 gssd_flags=""			# Flags for gssd.
 
 rwhod_enable="NO"		# Run the rwho daemon (or NO).