===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc.conf,v
retrieving revision 1.144
retrieving revision 1.145
diff -c -r1.144 -r1.145
*** src/etc/rc.conf	2011/07/07 14:43:49	1.144
--- src/etc/rc.conf	2011/07/07 18:17:50	1.145
***************
*** 1,6 ****
  #!/bin/sh -
  #
! #	$OpenBSD: rc.conf,v 1.144 2011/07/07 14:43:49 ajacoutot Exp $
  
  # set these to "NO" to turn them off.  otherwise, they're used as flags
  ldpd_flags=NO		# for normal use: ""
--- 1,6 ----
  #!/bin/sh -
  #
! #	$OpenBSD: rc.conf,v 1.145 2011/07/07 18:17:50 ajacoutot Exp $
  
  # set these to "NO" to turn them off.  otherwise, they're used as flags
  ldpd_flags=NO		# for normal use: ""
***************
*** 50,55 ****
--- 50,58 ----
  inetd_flags=""		# for normal use: ""
  rwhod_flags=NO		# for normal use: ""
  portmap_flags=NO	# for normal use: ""
+ kdc_flags=NO		# for normal use: "" see 'info heimdal' for help
+ kadmind_flags=NO	# for normal use: ""
+ kpasswdd_flags=NO	# for normal use: ""
  
  # use -u to disable chroot, see httpd(8)
  httpd_flags=NO		# for normal use: "" (or "-DSSL" after reading ssl(8))
***************
*** 83,90 ****
  check_quotas=YES	# NO may be desirable in some YP environments
  accounting=NO		# process accounting (using /var/account/acct)
  
- krb5_master_kdc=NO	# KerberosV master KDC. Run 'info heimdal' for help.
- krb5_slave_kdc=NO	# KerberosV slave KDC.
  afs=NO			# mount and run afs
  
  # Multicast routing configuration
--- 86,91 ----
***************
*** 114,124 ****
  
  local_rcconf="/etc/rc.conf.local"
  
! unset inetd_flags rwhod_flags portmap_flags
  
  [ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line
  
! # backward compatibility for inetd, portmap and rwhod
  : ${inetd_flags=$([ X"${inetd-YES}" = XYES ] || echo NO)}
  : ${rwhod_flags=$([ X"${rwhod-NO}" = XYES ] || echo NO)}
  : ${portmap_flags=$([ X"${portmap-NO}" = XYES ] || echo NO)}
--- 115,128 ----
  
  local_rcconf="/etc/rc.conf.local"
  
! unset inetd_flags rwhod_flags portmap_flags kdc_flags kadmind_flags kpasswdd_flags
  
  [ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line
  
! # backward compatibility
  : ${inetd_flags=$([ X"${inetd-YES}" = XYES ] || echo NO)}
  : ${rwhod_flags=$([ X"${rwhod-NO}" = XYES ] || echo NO)}
  : ${portmap_flags=$([ X"${portmap-NO}" = XYES ] || echo NO)}
+ : ${kdc_flags=$([ X"${krb5_master_kdc-NO}" = XYES -o X"${krb5_slave_kdc-NO}" = XYES ] || echo NO)}
+ : ${kadmind_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)}
+ : ${kpasswdd_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)}