Browse Source

support for smtpd(8); ok gilles@

OPENBSD_4_6
jacekm 15 years ago
parent
commit
3a36c50bc4
3 changed files with 11 additions and 3 deletions
  1. +4
    -1
      src/etc/changelist
  2. +5
    -1
      src/etc/rc
  3. +2
    -1
      src/etc/rc.conf

+ 4
- 1
src/etc/changelist View File

@ -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 # List of files which the security script backs up and checks
# for modifications. # for modifications.
@ -62,10 +62,13 @@
/etc/mail/localhost.cf /etc/mail/localhost.cf
/etc/mail/mailertable /etc/mail/mailertable
/etc/mail/relay-domains /etc/mail/relay-domains
+/etc/mail/secrets
/etc/mail/sendmail.cf /etc/mail/sendmail.cf
/etc/mail/smtpd.conf
/etc/mail/spamd.conf /etc/mail/spamd.conf
/etc/mail/submit.cf /etc/mail/submit.cf
/etc/mail/trusted-users /etc/mail/trusted-users
/etc/mail/virtual
/etc/mail/virtusertable /etc/mail/virtusertable
/etc/mailer.conf /etc/mailer.conf
/etc/man.conf /etc/man.conf


+ 5
- 1
src/etc/rc View File

@ -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 # System startup script run by init on autoboot
# or after single-user. # 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 & ) echo -n ' sendmail'; ( /usr/sbin/sendmail ${sendmail_flags} >/dev/null 2>&1 & )
fi fi
if [ X"${smtpd_flags}" != X"NO" ]; then
echo -n ' smtpd'; smtpd $smtpd_flags
fi
if [ X"${httpd_flags}" != X"NO" ]; then if [ X"${httpd_flags}" != X"NO" ]; then
# Clean up left-over httpd locks # Clean up left-over httpd locks
rm -f /var/www/logs/{ssl_mutex,httpd.lock,accept.lock}.* rm -f /var/www/logs/{ssl_mutex,httpd.lock,accept.lock}.*


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

@ -1,6 +1,6 @@
#!/bin/sh - #!/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 # set these to "NO" to turn them off. otherwise, they're used as flags
ripd_flags=NO # for normal use: "" ripd_flags=NO # for normal use: ""
@ -41,6 +41,7 @@ hostapd_flags=NO # for normal use: ""
ifstated_flags=NO # for normal use: "" ifstated_flags=NO # for normal use: ""
relayd_flags=NO # for normal use: "" relayd_flags=NO # for normal use: ""
snmpd_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) # use -u to disable chroot, see httpd(8)
httpd_flags=NO # for normal use: "" (or "-DSSL" after reading ssl(8)) httpd_flags=NO # for normal use: "" (or "-DSSL" after reading ssl(8))


Loading…
Cancel
Save