diff --git a/src/etc/rc b/src/etc/rc index 033bc77d..9cf2b3cc 100644 --- a/src/etc/rc +++ b/src/etc/rc @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.299 2007/02/27 02:10:58 beck Exp $ +# $OpenBSD: rc,v 1.300 2007/02/27 16:21:29 beck Exp $ # System startup script run by init on autoboot # or after single-user. @@ -668,7 +668,7 @@ if [ X"${sshd_flags}" != X"NO" ]; then fi if [ X"${spamd_flags}" != X"NO" ]; then - if [ X"${spamd_grey}" = X"NO" ]; then + if [ X"${spamd_black}" != X"NO" ]; then spamd_flags="${spamd_flags} -b" fi echo -n ' spamd'; eval /usr/libexec/spamd ${spamd_flags} diff --git a/src/etc/rc.conf b/src/etc/rc.conf index cab99b63..ca2726e3 100644 --- a/src/etc/rc.conf +++ b/src/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.122 2007/02/24 19:30:59 millert Exp $ +# $OpenBSD: rc.conf,v 1.123 2007/02/27 16:21:29 beck 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=YES # set to NO to run spamd in non-greylisting mode +spamd_black=NO # set to YES to run spamd without greylisting spamlogd_flags="" # use eg. "-i interface" and see spamlogd(8) # Set to NO if ftpd is running out of inetd