===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc.conf,v
retrieving revision 1.166
retrieving revision 1.167
diff -c -r1.166 -r1.167
*** src/etc/rc.conf	2012/03/05 10:43:42	1.166
--- src/etc/rc.conf	2012/04/01 18:32:51	1.167
***************
*** 1,6 ****
  #!/bin/sh -
  #
! #	$OpenBSD: rc.conf,v 1.166 2012/03/05 10:43:42 dlg 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.167 2012/04/01 18:32:51 deraadt Exp $
  
  # set these to "NO" to turn them off.  otherwise, they're used as flags
  ldpd_flags=NO		# for normal use: ""
***************
*** 122,128 ****
  local_rcconf="/etc/rc.conf.local"
  
  unset inetd_flags rwhod_flags portmap_flags kdc_flags kadmind_flags
! unset kpasswdd_flags btd_flags nfsd_flags mountd_flags lockd_flags
  unset statd_flags amd_flags ypbind_flags sndiod_flags
  
  [ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line
--- 122,128 ----
  local_rcconf="/etc/rc.conf.local"
  
  unset inetd_flags rwhod_flags portmap_flags kdc_flags kadmind_flags
! unset kpasswdd_flags nfsd_flags mountd_flags lockd_flags
  unset statd_flags amd_flags ypbind_flags sndiod_flags
  
  [ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line
***************
*** 146,152 ****
  : ${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)}
- : ${btd_flags=$([ X"${bt-NO}" = XYES ] || echo NO)}
  : ${nfsd_flags=$([ X"${nfs_server-NO}" = XYES ] && echo "-tun 4" || echo NO)}
  : ${mountd_flags=$([ X"${nfs_server-NO}" = XYES ] || echo NO)}
  : ${lockd_flags=$([ X"${lockd-NO}" = XYES ] || echo NO)}
--- 146,151 ----