Make greylisting the default when spamd is enabled. Uses the new -g flag

for spamd-setup.  OK beck@

src/etc/crontab

@@ -1,4 +1,4 @@
-#	$OpenBSD: crontab,v 1.13 2006/10/06 23:56:18 ray Exp $
+#	$OpenBSD: crontab,v 1.14 2007/02/24 19:30:59 millert Exp $
 #
 # /var/cron/tabs/root - root's crontab
 #
@@ -20,4 +20,4 @@ HOME=/var/log
 30	1	*	*	*	umask 077; /bin/sh /etc/daily 2>&1 | tee /var/log/daily.out | mail -s "`/bin/hostname` daily output" root
 30	3	*	*	6	umask 077; /bin/sh /etc/weekly 2>&1 | tee /var/log/weekly.out | mail -s "`/bin/hostname` weekly output" root
 30	5	1	*	*	umask 077; /bin/sh /etc/monthly 2>&1 | tee /var/log/monthly.out | mail -s "`/bin/hostname` monthly output" root
-#0	*	*	*	*	/usr/libexec/spamd-setup
+#0	*	*	*	*	/usr/libexec/spamd-setup -g

src/etc/pf.conf

@@ -1,4 +1,4 @@
-#	$OpenBSD: pf.conf,v 1.33 2006/10/24 16:33:21 david Exp $
+#	$OpenBSD: pf.conf,v 1.34 2007/02/24 19:30:59 millert Exp $
 #
 # See pf.conf(5) and /usr/share/pf for syntax and examples.
 # Remember to set net.inet.ip.forwarding=1 and/or net.inet6.ip6.forwarding=1
@@ -7,7 +7,6 @@
 #ext_if="ext0"
 #int_if="int0"
 
-#table <spamd> persist
 #table <spamd-white> persist
 
 #set skip on lo
@@ -18,9 +17,8 @@
 #rdr-anchor "ftp-proxy/*"
 #nat on $ext_if from !($ext_if) -> ($ext_if:0)
 #rdr pass on $int_if proto tcp to port ftp -> 127.0.0.1 port 8021
-#rdr pass on $ext_if proto tcp from <spamd> to port smtp \
-#	-> 127.0.0.1 port spamd
-#rdr pass on $ext_if proto tcp from !<spamd-white> to port smtp \
+#no rdr on $ext_if proto tcp from <spamd-white> to any port smtp
+#rdr pass on $ext_if proto tcp from any to any port smtp \
 #	-> 127.0.0.1 port spamd
 
 #anchor "ftp-proxy/*"

src/etc/rc.conf

@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.121 2007/02/02 14:51:19 ajacoutot Exp $
+#	$OpenBSD: rc.conf,v 1.122 2007/02/24 19:30:59 millert Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
@@ -46,7 +46,7 @@ httpd_flags=NO		# for normal use: "" (or "-DSSL" after reading ssl(8))
 # For normal use: "-L sm-mta -bd -q30m", and note there is a cron job
 sendmail_flags="-L sm-mta -C/etc/mail/localhost.cf -bd -q30m"
 spamd_flags=NO		# for normal use: "" and see spamd-setup(8)
-spamd_grey=NO		# use spamd greylisting if YES
+spamd_grey=YES		# set to NO to run spamd in non-greylisting mode
 spamlogd_flags=""	# use eg. "-i interface" and see spamlogd(8)
 
 # Set to NO if ftpd is running out of inetd