From 4ce20b36fb2211e547bceb202224d95c39c7eca9 Mon Sep 17 00:00:00 2001
From: kmos <>
Date: Wed, 24 Jul 2019 15:31:53 +0000
Subject: [PATCH] Stop using reserved words in the smtpd.conf configuration
 examples in the default smtpd.conf and smtpd.conf(5) manual page. This
 eliminates ambiguity in our documentation examples that can cause confusion.

Input and OK deraadt@ schwarze@ kn@
---
 src/etc/mail/smtpd.conf | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/etc/mail/smtpd.conf b/src/etc/mail/smtpd.conf
index a570aa36..a9717751 100644
--- a/src/etc/mail/smtpd.conf
+++ b/src/etc/mail/smtpd.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: smtpd.conf,v 1.11 2018/06/04 21:10:58 jmc Exp $
+#	$OpenBSD: smtpd.conf,v 1.12 2019/07/24 15:31:53 kmos Exp $
 
 # This is the smtpd server system-wide configuration file.
 # See smtpd.conf(5) for more information.
@@ -9,11 +9,11 @@ table aliases file:/etc/mail/aliases
 #
 listen on lo0
 
-action "local" mbox alias <aliases>
-action "relay" relay
+action "local_mail" mbox alias <aliases>
+action "outbound" relay
 
 # Uncomment the following to accept external mail for domain "example.org"
 #
-# match from any for domain "example.org" action "local"
-match for local action "local"
-match for any action "relay"
+# match from any for domain "example.org" action "local_mail"
+match for local action "local_mail"
+match for any action "outbound"