===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/rc.conf,v
retrieving revision 1.153
retrieving revision 1.154
diff -c -r1.153 -r1.154
*** src/etc/rc.conf	2011/07/08 18:01:31	1.153
--- src/etc/rc.conf	2011/07/08 21:42:52	1.154
***************
*** 1,6 ****
  #!/bin/sh -
  #
! #	$OpenBSD: rc.conf,v 1.153 2011/07/08 18:01:31 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.154 2011/07/08 21:42:52 robert Exp $
  
  # set these to "NO" to turn them off.  otherwise, they're used as flags
  ldpd_flags=NO		# for normal use: ""
***************
*** 53,59 ****
  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))
--- 53,59 ----
  kadmind_flags=NO	# for normal use: ""
  kpasswdd_flags=NO	# for normal use: ""
  btd_flags=NO		# for normal use: ""
! amd_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))
***************
*** 125,130 ****
--- 125,136 ----
  # all the time
  if [  X"${spamd_flags}" = X"NO" -o X"${spamd_black}" != X"NO" ]; then
  	spamlogd_flags=NO
+ fi
+ 
+ # special care needed for pflogd to avoid starting it up and failing
+ # if pf is not enabled
+ if [ X"${PF}" = X"NO" ]; then
+ 	pflogd_flags=NO
  fi
  
  # backward compatibility