From 01d0115415be091556b613204a3eff246d9d2f4b Mon Sep 17 00:00:00 2001
From: tedu <>
Date: Wed, 12 Mar 2014 18:21:34 +0000
Subject: [PATCH] switch over to smtpd by default. ok deraadt gilles todd

---
 src/etc/crontab         |  4 ++--
 src/etc/mail/smtpd.conf |  4 ++--
 src/etc/mailer.conf     | 14 +++++++-------
 src/etc/rc.conf         |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/etc/crontab b/src/etc/crontab
index 42dca9b2..f32cd8c3 100644
--- a/src/etc/crontab
+++ b/src/etc/crontab
@@ -1,4 +1,4 @@
-#	$OpenBSD: crontab,v 1.19 2013/10/19 15:26:06 halex Exp $
+#	$OpenBSD: crontab,v 1.20 2014/03/12 18:21:34 tedu Exp $
 #
 # /var/cron/tabs/root - root's crontab
 #
@@ -9,7 +9,7 @@ HOME=/var/log
 #minute	hour	mday	month	wday	command
 #
 # sendmail clientmqueue runner
-*/30	*	*	*	*	/usr/sbin/sendmail -L sm-msp-queue -Ac -q
+#*/30	*	*	*	*	/usr/sbin/sendmail -L sm-msp-queue -Ac -q
 #
 # rotate log files every hour, if necessary
 0	*	*	*	*	/usr/bin/newsyslog
diff --git a/src/etc/mail/smtpd.conf b/src/etc/mail/smtpd.conf
index 99d7e56f..1ce25710 100644
--- a/src/etc/mail/smtpd.conf
+++ b/src/etc/mail/smtpd.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: smtpd.conf,v 1.6 2013/01/26 09:38:25 gilles Exp $
+#	$OpenBSD: smtpd.conf,v 1.7 2014/03/12 18:21:34 tedu Exp $
 
 # This is the smtpd server system-wide configuration file.
 # See smtpd.conf(5) for more information.
@@ -13,4 +13,4 @@ table aliases db:/etc/mail/aliases.db
 #
 # accept from any for domain "example.org" alias <aliases> deliver to mbox
 accept for local alias <aliases> deliver to mbox
-accept for any relay
+accept from local for any relay
diff --git a/src/etc/mailer.conf b/src/etc/mailer.conf
index 8f6d12be..1e0eb64f 100644
--- a/src/etc/mailer.conf
+++ b/src/etc/mailer.conf
@@ -1,11 +1,11 @@
-#	$OpenBSD: mailer.conf,v 1.4 2009/03/16 14:26:22 jacekm Exp $
+#	$OpenBSD: mailer.conf,v 1.5 2014/03/12 18:21:34 tedu Exp $
 #
-# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
+# Execute the "real" sendmail program, which is now smtpd by default
 #
-sendmail	/usr/libexec/sendmail/sendmail
-send-mail	/usr/libexec/sendmail/sendmail
-mailq		/usr/libexec/sendmail/sendmail
-makemap		/usr/libexec/sendmail/makemap
-newaliases	/usr/libexec/sendmail/sendmail
+sendmail	/usr/sbin/smtpctl
+send-mail	/usr/sbin/smtpctl
+mailq		/usr/sbin/smtpctl
+makemap		/usr/libexec/smtpd/makemap
+newaliases	/usr/libexec/smtpd/makemap
 hoststat	/usr/libexec/sendmail/sendmail
 purgestat	/usr/libexec/sendmail/sendmail
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 22ad6582..6f5fb1cd 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.184 2013/12/18 09:12:33 ajacoutot Exp $
+#	$OpenBSD: rc.conf,v 1.185 2014/03/12 18:21:34 tedu Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -53,7 +53,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: ""
+smtpd_flags=""		# for normal use: ""
 sndiod_flags=""		# for normal use: ""
 ldapd_flags=NO		# for normal use: ""
 npppd_flags=NO		# for normal use: ""
@@ -80,7 +80,7 @@ nginx_flags=NO		# for normal use: ""
 slowcgi_flags=NO	# for normal use: ""
 
 # 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=NO
 spamd_flags=NO		# for normal use: "" and see spamd(8)
 spamd_black=NO		# set to YES to run spamd without greylisting
 spamlogd_flags=""	# use eg. "-i interface" and see spamlogd(8)