summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2004-11-03 18:04:48 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2004-11-03 18:04:48 +0000
commit756faa6aed213e1774aae4962b3ae735800b6b5b (patch)
tree05bb92ef2472723abd5f12b6631ac60b798a2468
parente1b8cb29bc1124e3f8497a051f1ed43e2efcf8ad (diff)
introduce spamlogd_flags to make it easier to e. g. bind spamlogd
to an interface; no change in default config from Toni Mueller <support@oeko.net>, ja ja ja ja bob
-rw-r--r--etc/rc4
-rw-r--r--etc/rc.conf3
2 files changed, 4 insertions, 3 deletions
diff --git a/etc/rc b/etc/rc
index 6b1317d3fcb..6bc16a3e15d 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.258 2004/10/22 00:59:09 itojun Exp $
+# $OpenBSD: rc,v 1.259 2004/11/03 18:04:46 henning Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -572,7 +572,7 @@ if [ "X${spamd_flags}" != X"NO" ]; then
/usr/libexec/spamd-setup
if [ "X${spamd_grey}" != X"NO" ]; then
echo -n ' spamlogd'
- /usr/libexec/spamlogd
+ /usr/libexec/spamlogd ${spamlogd_flags}
fi
fi
diff --git a/etc/rc.conf b/etc/rc.conf
index 0702959d861..d9238979d86 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: rc.conf,v 1.103 2004/09/18 20:28:17 jmc Exp $
+# $OpenBSD: rc.conf,v 1.104 2004/11/03 18:04:47 henning Exp $
# set these to "NO" to turn them off. otherwise, they're used as flags
routed_flags=NO # for normal use: "-q"
@@ -37,6 +37,7 @@ httpd_flags=NO # for normal use: "" (or "-DSSL" after reading ssl(8))
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
+spamlogd_flags="" # use eg. "-i interface" and see spamlogd(8)
# Set to NO if ftpd is running out of inetd
ftpd_flags=NO # for non-inetd use: "-D"