diff options
| author |   sunil <sunil@openbsd.org> | 2015-12-14 02:56:07 +0000 |
|---|---|---|
| committer | sunil <sunil@openbsd.org> | 2015-12-14 02:56:07 +0000 |
| commit | 60e6d519fd47b2d89939f46c6922246c28eff624 (patch) | |
| tree | 5c8002091f5a4a74fd6b844ef2cec4914567f995 | |
| parent | pledge. (diff) | |
| download | wireguard-openbsd-60e6d519fd47b2d89939f46c6922246c28eff624.tar.xz wireguard-openbsd-60e6d519fd47b2d89939f46c6922246c28eff624.zip | |
Update default MTA reference to smtpd(8). Rectify documentation of
fallback behaviour when configuration file is missing.
Documentation bits from Serguey Parkhomovsky.
Ok jung@ "if the fallback code stays"
| -rw-r--r-- | usr.sbin/mailwrapper/mailwrapper.8 | 12 | ||||
| -rw-r--r-- | usr.sbin/mailwrapper/mailwrapper.c | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/usr.sbin/mailwrapper/mailwrapper.8 b/usr.sbin/mailwrapper/mailwrapper.8 index 854948228c0..7b7e7358dd4 100644 --- a/usr.sbin/mailwrapper/mailwrapper.8 +++ b/usr.sbin/mailwrapper/mailwrapper.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mailwrapper.8,v 1.12 2014/03/27 22:34:42 jmc Exp $ +.\" $OpenBSD: mailwrapper.8,v 1.13 2015/12/14 02:56:07 sunil Exp $ .\" $NetBSD: mailwrapper.8,v 1.5 1999/03/22 18:44:01 garbled Exp $ .\" .\" Copyright (c) 1998 @@ -30,7 +30,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: March 27 2014 $ +.Dd $Mdocdate: December 14 2015 $ .Dt MAILWRAPPER 8 .Os .Sh NAME @@ -120,9 +120,11 @@ is typically set up as a symlink to which is not usually invoked on its own. .Sh DIAGNOSTICS .Nm -will return an error value and print a diagnostic if its configuration -file is missing or malformed, or does not contain a mapping for the -name under which +will invoke +.Xr smtpd 8 +if its configuration file is missing. +It will return an error value and print a diagnostic if its configuration +file is malformed, or does not contain a mapping for the name under which .Nm was invoked. .Sh SEE ALSO diff --git a/usr.sbin/mailwrapper/mailwrapper.c b/usr.sbin/mailwrapper/mailwrapper.c index 8c01b87b90f..2796e384303 100644 --- a/usr.sbin/mailwrapper/mailwrapper.c +++ b/usr.sbin/mailwrapper/mailwrapper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mailwrapper.c,v 1.20 2015/10/12 22:01:08 deraadt Exp $ */ +/* $OpenBSD: mailwrapper.c,v 1.21 2015/12/14 02:56:07 sunil Exp $ */ /* $NetBSD: mailwrapper.c,v 1.2 1999/02/20 22:10:07 thorpej Exp $ */ /* @@ -41,7 +41,7 @@ #include <util.h> #define _PATH_MAILERCONF "/etc/mailer.conf" -#define _PATH_DEFAULTMTA "/usr/libexec/sendmail/sendmail" +#define _PATH_DEFAULTMTA "/usr/sbin/smtpctl" struct arglist { size_t argc, maxc; |