Browse Source

add support for spamd greylisting with spamd -g and spamlogd to rc/rc.conf

OPENBSD_3_5
beck 21 years ago
parent
commit
6706c7e152
2 changed files with 10 additions and 2 deletions
  1. +8
    -1
      src/etc/rc
  2. +2
    -1
      src/etc/rc.conf

+ 8
- 1
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.234 2004/02/25 08:42:38 jmc Exp $
# $OpenBSD: rc,v 1.235 2004/02/26 07:33:08 beck Exp $
# System startup script run by init on autoboot # System startup script run by init on autoboot
# or after single-user. # or after single-user.
@ -498,8 +498,15 @@ if [ "X${sendmail_flags}" != X"NO" -a -s /etc/mailer.conf ]; then
fi fi
if [ "X${spamd_flags}" != X"NO" ]; then if [ "X${spamd_flags}" != X"NO" ]; then
if [ "X${spamd_grey}" != X"NO" ]; then
spamd_flags="${spamd_flags} -g"
fi
echo -n ' spamd'; /usr/libexec/spamd ${spamd_flags} echo -n ' spamd'; /usr/libexec/spamd ${spamd_flags}
/usr/libexec/spamd-setup /usr/libexec/spamd-setup
if [ "X${spamd_grey}" != X"NO" ]; then
echo -n ' spamlogd'
/usr/libexec/spamlogd
fi
fi fi
if [ "X${httpd_flags}" != X"NO" ]; then if [ "X${httpd_flags}" != X"NO" ]; then


+ 2
- 1
src/etc/rc.conf View File

@ -1,6 +1,6 @@
#!/bin/sh - #!/bin/sh -
# #
# $OpenBSD: rc.conf,v 1.93 2004/02/11 23:17:33 beck Exp $
# $OpenBSD: rc.conf,v 1.94 2004/02/26 07:33:08 beck Exp $
# set these to "NO" to turn them off. otherwise, they're used as flags # set these to "NO" to turn them off. otherwise, they're used as flags
routed_flags=NO # for normal use: "-q" routed_flags=NO # for normal use: "-q"
@ -34,6 +34,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 # 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" sendmail_flags="-L sm-mta -C/etc/mail/localhost.cf -bd -q30m"
spamd_flags=NO # for normal use: "" and see spamd-setup(8) spamd_flags=NO # for normal use: "" and see spamd-setup(8)
spamd_grey=NO # use spamd greylisting if YES
# Set to NO if ftpd is running out of inetd # Set to NO if ftpd is running out of inetd
ftpd_flags=NO # for non-inetd use: "-D" ftpd_flags=NO # for non-inetd use: "-D"


Loading…
Cancel
Save