On Mon, Jul 16, 2018 at 10:36:35AM -0600, Todd C. Miller wrote: > Now that aliases in smtpd.conf default to plain text files and not > db files we don't want to tell people to run makemap instead of > newaliases. > > - todd >
evening. comments inline: > Index: usr.sbin/smtpd/newaliases.8 > =================================================================== > RCS file: /cvs/src/usr.sbin/smtpd/newaliases.8,v > retrieving revision 1.11 > diff -u -p -u -r1.11 newaliases.8 > --- usr.sbin/smtpd/newaliases.8 22 Dec 2015 17:52:21 -0000 1.11 > +++ usr.sbin/smtpd/newaliases.8 16 Jul 2018 16:33:41 -0000 > @@ -20,21 +20,22 @@ > .Os > .Sh NAME > .Nm newaliases > -.Nd rebuild the database for the mail aliases file > +.Nd rebuild the mail aliases database mail aliases *file*, not database, no? > .Sh SYNOPSIS > .Nm newaliases > .Op Fl f Ar file > .Sh DESCRIPTION > +The > .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 . > -If using database (db) files > -this utility must be run every time the > +utility makes changes to the mail aliases file visible to > +.Xr smtpd 8 . > +It should be run every time the > .Xr aliases 5 > file is changed. > +The location of the alias file is defined in > +.Xr smtpd.conf 5 , > +and defaults to > +.Pa /etc/mail/aliases . > .Pp > The options are as follows: > .Bl -tag -width Ds > @@ -46,12 +47,21 @@ instead of the default > .Pa /etc/mail/smtpd.conf . > .El > .Pp > -Note: this utility is provided for sendmail compatibility. > -The preferred way of rebuilding the database is with > -.Xr makemap 8 : > +If using database (db) files, > +.Nm > +is equivalent to running > +.Xr makemap 8 as follows: "as follows" should be on a new line > .Bd -literal -offset indent > # makemap -t aliases /etc/mail/aliases > .Ed > +.Pp > +If using plain text files, > +.Nm > +is equivalent to running > +.Xr smtpctl 8 as follows: ditto except for this, i think your diff is good. jmc > +.Bd -literal -offset indent > +# smtpctl update table aliases > +.Ed > .Sh FILES > .Bl -tag -width "/etc/mail/aliasesXXX" -compact > .It Pa /etc/mail/aliases > @@ -63,7 +73,9 @@ List of virtual host aliases. > .Ex -std newaliases > .Sh SEE ALSO > .Xr smtpd.conf 5 , > -.Xr makemap 8 > +.Xr makemap 8 , > +.Xr smtpctl 8 , > +.Xr smtpd 8 > .Sh HISTORY > The > .Nm >
