===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc.conf,v
retrieving revision 1.149
retrieving revision 1.150
diff -c -r1.149 -r1.150
*** src/etc/rc.conf	2011/07/08 00:54:04	1.149
--- src/etc/rc.conf	2011/07/08 02:15:34	1.150
***************
*** 1,6 ****
  #!/bin/sh -
  #
! #	$OpenBSD: rc.conf,v 1.149 2011/07/08 00:54:04 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.150 2011/07/08 02:15:34 robert Exp $
  
  # set these to "NO" to turn them off.  otherwise, they're used as flags
  ldpd_flags=NO		# for normal use: ""
***************
*** 52,58 ****
  kdc_flags=NO		# for normal use: "" see 'info heimdal' for help
  kadmind_flags=NO	# for normal use: ""
  kpasswdd_flags=NO	# for normal use: ""
! btd_flags=NO
  
  # use -u to disable chroot, see httpd(8)
  httpd_flags=NO		# for normal use: "" (or "-DSSL" after reading ssl(8))
--- 52,59 ----
  kdc_flags=NO		# for normal use: "" see 'info heimdal' for help
  kadmind_flags=NO	# for normal use: ""
  kpasswdd_flags=NO	# for normal use: ""
! btd_flags=NO		# for normal use: ""
! amd_flags=NO
  
  # use -u to disable chroot, see httpd(8)
  httpd_flags=NO		# for normal use: "" (or "-DSSL" after reading ssl(8))
***************
*** 76,82 ****
  wsmoused_flags=NO	# for ps/2 or usb mice: "", serial: "-p /dev/cua00"
  
  # set the following to "YES" to turn them on
- amd=NO
  pf=YES			# Packet filter / NAT
  ipsec=NO		# IPsec
  bt=NO			# Bluetooth
--- 77,82 ----
***************
*** 134,136 ****
--- 134,137 ----
  : ${mountd_flags=$([ X"${nfs_server-NO}" = XYES ] || echo NO)}
  : ${lockd_flags=$([ X"${lockd-NO}" = XYES ] || echo NO)}
  : ${statd_flags=$([ X"${lockd-NO}" = XYES ] || echo NO)}
+ : ${amd_flags=$([ X"${amd-NO}" = XYES ] || echo NO)}