sync makemap man page with the code. create separate page for newaliases

which points at makemap as the preferred utility; ok gilles@

3 files changed, 108 insertions, 49 deletions

diff --git a/usr.sbin/smtpd/makemap.8 b/usr.sbin/smtpd/makemap.8
index a8bf6f207bd..e51ed2efe80 100644
--- a/usr.sbin/smtpd/makemap.8
+++ b/usr.sbin/smtpd/makemap.8
@@ -1,56 +1,56 @@
-.\"	$OpenBSD: makemap.8,v 1.4 2009/02/14 18:37:12 jacekm Exp $
-.\" Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
-.\"	All rights reserved.
-.\" Copyright (c) 1988, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
+.\"	$OpenBSD: makemap.8,v 1.5 2009/02/17 23:46:03 jacekm Exp $
 .\"
-.\" By using this file, you agree to the terms and conditions set
-.\" forth in the LICENSE file which can be found at the top level of
-.\" the sendmail distribution.
+.\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@openbsd.org>
+.\" Copyright (c) 2008-2009 Gilles Chechade <gilles@openbsd.org>
 .\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
 .\"
-.\"     $Sendmail: makemap.8,v 8.30 2002/06/27 23:41:04 gshapiro Exp $
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: February 14 2009 $
+.Dd $Mdocdate: February 17 2009 $
 .Dt MAKEMAP 8
 .Os
 .Sh NAME
-.Nm makemap ,
-.Nm newaliases
+.Nm makemap
 .Nd create database maps for smtpd
 .Sh SYNOPSIS
 .Nm makemap
-.Op Fl t Ar type
 .Op Fl o Ar dbfile
+.Op Fl t Ar type
 .Ar file
-.Nm newaliases
 .Sh DESCRIPTION
 .Nm
-creates the database maps used by the keyed map lookups in
+creates the database maps used by keyed map lookups in
 .Xr smtpd 8 .
 It reads input from
 .Ar file
-and outputs them to
-.Ar dbfile .
-If
-.Ar dbfile
-is not specified, output file name is made by appending .db
-to
+and writes database to a file
+whose name is made by adding .db suffix to
 .Ar file .
 .Pp
 In all cases,
 .Nm
-reads lines from 
-.Ar file
-consisting of words separated by whitespace.
+reads lines consisting of words separated by whitespace.
 The first is the database key,
 the remaining specify mapped value.
 Database key and value may optionally be separated
-using colon character.
+by the colon character.
 .Pp
-The 
-.Ar type
-argument specifies format of resulting map file.
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl o Ar dbfile
+Write generated database to
+.Ar dbfile .
+.It Fl t Ar type
+Specify format of resulting map file.
 Default map format is suitable for storing simple, unstructured
 key-to-value string associations.
 However, if mapped value has special meaning,
@@ -66,15 +66,8 @@ This format can be used for building user aliases and
 virtual domains database files.
 .El
 .Pp
+.El
 .Ex -std makemap
-.Pp
-.Nm newaliases 
-rebuilds the random access database for the mail aliases file
-.Pa /etc/mail/aliases .
-It must be run each time this file is changed
-in order for the change to take effect.
-.Pp
-.Ex -std newaliases
 .Sh FILES
 .Bl -tag -width "/etc/mail/aliasesXXX" -compact
 .It Pa /etc/mail/aliases
@@ -83,15 +76,14 @@ List of user mail aliases.
 List of hosted virtual domains.
 .El
 .Sh SEE ALSO
-.Xr editmap 8 ,
-.Xr smtpd 8 ,
 .Xr aliases 5 ,
-.Xr mailer.conf 5
+.Xr mailer.conf 5 ,
+.Xr editmap 8 ,
+.Xr newaliases 8 ,
+.Xr smtpd 8
 .Sh HISTORY
-These
+The
 .Nm
-and
-.Nm newaliases
-commands first appeared in
-.Ox 4.5
-as the replacement for equivalent commands shipped with sendmail.
+command first appeared in
+.Ox 4.6
+as the replacement for equivalent command shipped with sendmail.
diff --git a/usr.sbin/smtpd/makemap/Makefile b/usr.sbin/smtpd/makemap/Makefile
index c25ddcc7931..2177c34076a 100644
--- a/usr.sbin/smtpd/makemap/Makefile
+++ b/usr.sbin/smtpd/makemap/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2008/12/21 12:59:09 jacekm Exp $
+#	$OpenBSD: Makefile,v 1.5 2009/02/17 23:46:03 jacekm Exp $
 
 .PATH:		${.CURDIR}/..
 
@@ -8,7 +8,7 @@ BINOWN=	root
 BINMODE?=555
 
 BINDIR=	/usr/bin
-MAN=	makemap.8
+MAN=	makemap.8 newaliases.8
 
 CFLAGS+=	-g3 -ggdb -I${.CURDIR}/..
 CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes
@@ -17,8 +17,7 @@ CFLAGS+=	-Wshadow -Wpointer-arith -Wcast-qual
 CFLAGS+=	-Wsign-compare -Wbounded
 
 LINKS=	${BINDIR}/makemap ${BINDIR}/newaliases
-MLINKS=	makemap.8 newaliases.8
 
-SRCS=	makemap.c aliases.c map.c log.c util.c
+SRCS=	parse.y makemap.c aliases.c map.c log.c util.c
 LDFLAGS=	-lutil
 .include <bsd.prog.mk>
diff --git a/usr.sbin/smtpd/newaliases.8 b/usr.sbin/smtpd/newaliases.8
new file mode 100644
index 00000000000..5f02669c80c
--- /dev/null
+++ b/usr.sbin/smtpd/newaliases.8
@@ -0,0 +1,68 @@
+.\"	$OpenBSD: newaliases.8,v 1.4 2009/02/17 23:46:03 jacekm Exp $
+.\"
+.\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@openbsd.org>
+.\" Copyright (c) 2008-2009 Gilles Chechade <gilles@openbsd.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd $Mdocdate: February 17 2009 $
+.Dt NEWALIASES 8
+.Os
+.Sh NAME
+.Nm newaliases
+.Nd rebuild the database for the mail aliases file
+.Sh SYNOPSIS
+.Nm newaliases
+.Op Fl f Ar file
+.Sh DESCRIPTION
+.Nm
+rebuilds the random access database for the mail aliases file,
+the location of which is defined in
+.Xr smtpd.conf 5 ,
+and which by default is
+.Pa /etc/mail/aliases .
+This utility must be run each time aliases file is changed
+in order for the change to take effect.
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl f Ar file
+Use
+.Ar file
+as the configuration file,
+instead of the default
+.Pa /etc/mail/smtpd.conf .
+.El
+.Pp
+Note: this utility is provided for Sendmail compatibilty.
+The preferred way of rebuilding the database is with
+.Xr makemap 8 :
+.Bd -literal -offset indent
+makemap -t aliases /etc/mail/aliases
+.Ed
+.Pp
+.Ex -std newaliases
+.Sh FILES
+.Bl -tag -width "/etc/mail/aliasesXXX" -compact
+.It Pa /etc/mail/aliases
+List of user mail aliases.
+.El
+.Sh SEE ALSO
+.Xr smtpd.conf 5 ,
+.Xr makemap 8
+.Sh HISTORY
+The
+.Nm
+command first appeared in
+.Ox 4.6
+as the replacement for equivalent command shipped with sendmail.