===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc.conf,v
retrieving revision 1.187
retrieving revision 1.188
diff -c -r1.187 -r1.188
*** src/etc/rc.conf	2014/03/15 22:13:36	1.187
--- src/etc/rc.conf	2014/04/23 09:56:56	1.188
***************
*** 1,6 ****
  #!/bin/sh -
  #
! #	$OpenBSD: rc.conf,v 1.187 2014/03/15 22:13:36 sthen Exp $
  
  # DO NOT EDIT THIS FILE!!
  #
--- 1,6 ----
  #!/bin/sh -
  #
! #	$OpenBSD: rc.conf,v 1.188 2014/04/23 09:56:56 ajacoutot Exp $
  
  # DO NOT EDIT THIS FILE!!
  #
***************
*** 62,72 ****
  rwhod_flags=NO		# for normal use: ""
  portmap_flags=NO	# for normal use: ""
  			# Note: inetd(8) rpc services need portmap too
- kdc_flags=NO		# for normal use: "" see 'info heimdal' for help
- kadmind_flags=NO	# for normal use: ""
- kpasswdd_flags=NO	# for normal use: ""
- ipropd_master_flags=NO	# for normal use: ""
- ipropd_slave_flags=NO	# for normal use: "[master hostname]"
  amd_flags=NO		# for normal use: "" and see amd_master below
  tftpd_flags=NO		# for normal use: "[chroot dir]"
  tftpproxy_flags=NO	# for normal use: ""
--- 62,67 ----
***************
*** 127,133 ****
  # started in the specified order and stopped in reverse order
  pkg_scripts=
  
! unset kadmind_flags kdc_flags kpasswdd_flags mountd_flags nfsd_flags ypbind_flags
  
  [ -f /etc/rc.conf.local ] && . /etc/rc.conf.local
  
--- 122,128 ----
  # started in the specified order and stopped in reverse order
  pkg_scripts=
  
! unset mountd_flags nfsd_flags ypbind_flags
  
  [ -f /etc/rc.conf.local ] && . /etc/rc.conf.local
  
***************
*** 144,152 ****
  fi
  
  # backward compatibility
- : ${kadmind_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)}
- : ${kdc_flags=$([ X"${krb5_master_kdc-NO}" = XYES -o X"${krb5_slave_kdc-NO}" = XYES ] || echo NO)}
- : ${kpasswdd_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)}
  : ${mountd_flags=$([ X"${nfs_server-NO}" = XYES ] || echo NO)}
  : ${nfsd_flags=$([ X"${nfs_server-NO}" = XYES ] && echo "-tun 4" || echo NO)}
  : ${ypbind_flags=$([ X"`domainname`" != X"" -a -d /var/yp/binding ] || echo NO)}
--- 139,144 ----