diff options
| author | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2009-03-16 23:18:46 +0000 |
|---|---|---|
| committer | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2009-03-16 23:18:46 +0000 |
| commit | 834e343b3c7a1ebc2b0e0a3c3830e20eb0e27063 (patch) | |
| tree | 9df9ddda08f7553f1b853704a2a3a3f9788a3f93 /etc | |
| parent | 5ec1ae4b59cbb1b9153fb58035106ad89480d750 (diff) | |
support for smtpd(8); ok gilles@
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/changelist | 5 | ||||
| -rw-r--r-- | etc/rc | 6 | ||||
| -rw-r--r-- | etc/rc.conf | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/etc/changelist b/etc/changelist index e10048582eb..ae72b2cad52 100644 --- a/etc/changelist +++ b/etc/changelist @@ -1,4 +1,4 @@ -# $OpenBSD: changelist,v 1.59 2008/10/02 07:27:57 sthen Exp $ +# $OpenBSD: changelist,v 1.60 2009/03/16 23:18:45 jacekm Exp $ # # List of files which the security script backs up and checks # for modifications. @@ -62,10 +62,13 @@ /etc/mail/localhost.cf /etc/mail/mailertable /etc/mail/relay-domains ++/etc/mail/secrets /etc/mail/sendmail.cf +/etc/mail/smtpd.conf /etc/mail/spamd.conf /etc/mail/submit.cf /etc/mail/trusted-users +/etc/mail/virtual /etc/mail/virtusertable /etc/mailer.conf /etc/man.conf @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.322 2009/03/04 05:29:09 mcbride Exp $ +# $OpenBSD: rc,v 1.323 2009/03/16 23:18:45 jacekm Exp $ # System startup script run by init on autoboot # or after single-user. @@ -698,6 +698,10 @@ if [ X"${sendmail_flags}" != X"NO" -a -s /etc/mailer.conf ]; then echo -n ' sendmail'; ( /usr/sbin/sendmail ${sendmail_flags} >/dev/null 2>&1 & ) fi +if [ X"${smtpd_flags}" != X"NO" ]; then + echo -n ' smtpd'; smtpd $smtpd_flags +fi + if [ X"${httpd_flags}" != X"NO" ]; then # Clean up left-over httpd locks rm -f /var/www/logs/{ssl_mutex,httpd.lock,accept.lock}.* diff --git a/etc/rc.conf b/etc/rc.conf index 59fb3d8d572..975d6f8b9fa 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.131 2008/11/27 00:52:06 uwe Exp $ +# $OpenBSD: rc.conf,v 1.132 2009/03/16 23:18:45 jacekm Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags ripd_flags=NO # for normal use: "" @@ -41,6 +41,7 @@ hostapd_flags=NO # for normal use: "" ifstated_flags=NO # for normal use: "" relayd_flags=NO # for normal use: "" snmpd_flags=NO # for normal use: "" +smtpd_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)) |