===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc.conf,v
retrieving revision 1.141
retrieving revision 1.142
diff -c -r1.141 -r1.142
*** src/etc/rc.conf	2011/02/12 11:21:01	1.141
--- src/etc/rc.conf	2011/07/06 18:55:36	1.142
***************
*** 1,6 ****
  #!/bin/sh -
  #
! #	$OpenBSD: rc.conf,v 1.141 2011/02/12 11:21:01 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.142 2011/07/06 18:55:36 robert Exp $
  
  # set these to "NO" to turn them off.  otherwise, they're used as flags
  ldpd_flags=NO		# for normal use: ""
***************
*** 47,52 ****
--- 47,54 ----
  smtpd_flags=NO		# for normal use: ""
  aucat_flags=NO		# for normal use: ""
  ldapd_flags=NO		# for normal use: ""
+ inetd_flags=""		# for normal use: ""
+ rwhod_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))
***************
*** 70,76 ****
  wsmoused_flags=NO	# for ps/2 or usb mice: "", serial: "-p /dev/cua00"
  
  # set the following to "YES" to turn them on
- rwhod=NO
  nfs_server=NO		# see sysctl.conf for nfs client configuration
  lockd=NO
  amd=NO
--- 72,77 ----
***************
*** 78,84 ****
  ipsec=NO		# IPsec
  bt=NO			# Bluetooth
  portmap=NO		# Note: inetd(8) rpc services need portmap too
- inetd=YES		# almost always needed
  check_quotas=YES	# NO may be desirable in some YP environments
  accounting=NO		# process accounting (using /var/account/acct)
  
--- 79,84 ----
***************
*** 113,116 ****
--- 113,122 ----
  
  local_rcconf="/etc/rc.conf.local"
  
+ unset inetd_flags rwhod_flags
+ 
  [ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line
+ 
+ # backward compatibility for inetd and rwhod
+ : ${inetd_flags=$([ X"${inetd-YES}" = XYES ] || echo NO)}
+ : ${rwhod_flags=$([ X"${rwhod-NO}" = XYES ] || echo NO)}