From 3a36c50bc49ab96edf67311296602ba0add6e54c Mon Sep 17 00:00:00 2001
From: jacekm <>
Date: Mon, 16 Mar 2009 23:18:45 +0000
Subject: [PATCH] support for smtpd(8); ok gilles@

---
 src/etc/changelist | 5 ++++-
 src/etc/rc         | 6 +++++-
 src/etc/rc.conf    | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/etc/changelist b/src/etc/changelist
index e1004858..ae72b2ca 100644
--- a/src/etc/changelist
+++ b/src/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
diff --git a/src/etc/rc b/src/etc/rc
index b0f3f9eb..02f29bd4 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -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/src/etc/rc.conf b/src/etc/rc.conf
index 59fb3d8d..975d6f8b 100644
--- a/src/etc/rc.conf
+++ b/src/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))