move the smtpd.conf-specific map bits back from makemap to smtpd.conf,

along with some tweakage;

ok jacekm gilles

2 files changed, 49 insertions, 52 deletions

diff --git a/usr.sbin/smtpd/makemap.8 b/usr.sbin/smtpd/makemap.8
index db81fec3834..e3e22432b5e 100644
--- a/usr.sbin/smtpd/makemap.8
+++ b/usr.sbin/smtpd/makemap.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: makemap.8,v 1.8 2009/09/22 13:05:20 jmc Exp $
+.\"	$OpenBSD: makemap.8,v 1.9 2009/09/25 13:44:33 jmc Exp $
 .\"
 .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@openbsd.org>
 .\" Copyright (c) 2008-2009 Gilles Chechade <gilles@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 22 2009 $
+.Dd $Mdocdate: September 25 2009 $
 .Dt MAKEMAP 8
 .Os
 .Sh NAME
@@ -73,52 +73,6 @@ virtual domains files.
 .Pp
 .El
 .Ex -std makemap
-.Sh MAP TYPES
-There are three types of map known to
-.Xr smtpd 8 :
-.Bl -tag -width Ds
-.It alias
-Map queried when resolving mail aliases.
-Query key is the user part of mail address.
-.It virtual
-Map used for creating virtual domains.
-See the
-.Sx VIRTUAL DOMAINS
-section below.
-.It secrets
-Map queried for credentials
-when relaying mail via server that requires SMTPAUTH
-before accepting mail for relaying.
-Query key is the domain name of the server acting as relay.
-.El
-.Pp
-The configuration directives that are valid in the
-.Ic map
-context are described below:
-.Bl -tag -width Ds
-.It Ic type Ar maptype
-Specifies method of accessing data.
-The following map types are supported:
-.Bl -tag -width Ds
-.It db
-Mappings are stored in a file created using
-.Nm .
-This is the default type if none is specified.
-.It dns
-Not implemented yet.
-.It file
-Not implemented yet.
-.El
-.It Ic source Ar mapsource
-Specifies the source of mapping data.
-It must be absolute path to a file in case of
-.Dq file
-and
-.Dq db
-.Ar maptype ,
-and a domain name in case of
-.Dq dns .
-.El
 .Sh VIRTUAL DOMAINS
 Virtual domains are kept in the virtual map.
 To create single virtual address, add
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5
index 73b780a4602..733a8a66c48 100644
--- a/usr.sbin/smtpd/smtpd.conf.5
+++ b/usr.sbin/smtpd/smtpd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: smtpd.conf.5,v 1.19 2009/09/23 10:26:01 jmc Exp $
+.\"	$OpenBSD: smtpd.conf.5,v 1.20 2009/09/25 13:44:33 jmc Exp $
 .\"
 .\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
 .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -16,7 +16,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\"
-.Dd $Mdocdate: September 23 2009 $
+.Dd $Mdocdate: September 25 2009 $
 .Dt SMTPD.CONF 5
 .Os
 .Sh NAME
@@ -124,9 +124,52 @@ This means that filter rules using "from local" will be matched.
 .No }
 .Xc
 Maps are used to provide additional configuration information for
-.Xr smtpd 8 ,
-and are described fully in
+.Xr smtpd 8 .
+.Pp
+.Ar map
+may be one of the following:
+.Pp
+.Bl -tag -width "virtualXXX" -compact
+.It alias
+Map queried for mail aliases.
+See
+.Xr aliases 5
+and
+.Xr newaliases 8 .
+.It secrets
+Map queried for remote host credentials.
+See
+.Xr makemap 8 .
+.It virtual
+Map queried for virtual domains.
+See
 .Xr makemap 8 .
+.El
+.Pp
+.Ar maptype
+may be one of the following:
+.Pp
+.Bl -tag -width "fileXXX" -compact
+.It db
+Mappings are stored in a file created using
+.Nm .
+This is the default type if none is specified.
+.It dns
+Not implemented yet.
+.It file
+Not implemented yet.
+.El
+.Pp
+.Ar mapsource
+specifies the source of the map data.
+It must be an absolute path to a file for the
+.Dq file
+and
+.Dq db
+maptypes,
+or a domain name for the
+.Dq dns
+maptype.
 .It Ic accept | reject
 .Xr smtpd 8
 accepts and rejects messages