diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2012-10-17 16:39:50 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2012-10-17 16:39:50 +0000 |
| commit | fcc490babd672edaae136d0b34a2bd36a84c5fef (patch) | |
| tree | d9bcd6b81cf09225f7cb1d60cf9823b0bfd5901a /usr.sbin | |
| parent | 2e8abf4b1143382210560d404080683be783dd30 (diff) | |
Document the -P option. While there, remove reference to -T, it's incomplete,
subject to changes and internal.
feedback from jmc@
ok gilles@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.8 | 33 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.c | 4 |
2 files changed, 21 insertions, 16 deletions
diff --git a/usr.sbin/smtpd/smtpd.8 b/usr.sbin/smtpd/smtpd.8 index 8c060544ef3..3edb2e0986e 100644 --- a/usr.sbin/smtpd/smtpd.8 +++ b/usr.sbin/smtpd/smtpd.8 @@ -1,5 +1,6 @@ -.\" $OpenBSD: smtpd.8,v 1.16 2012/09/26 16:19:45 jmc Exp $ +.\" $OpenBSD: smtpd.8,v 1.17 2012/10/17 16:39:49 eric Exp $ .\" +.\" Copyright (c) 2012, Eric Faurot <eric@openbsd.org> .\" Copyright (c) 2008, Gilles Chehade <gilles@openbsd.org> .\" Copyright (c) 2008, Pierre-Yves Ritschard <pyr@openbsd.org> .\" @@ -15,7 +16,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 26 2012 $ +.Dd $Mdocdate: October 17 2012 $ .Dt SMTPD 8 .Os .Sh NAME @@ -26,7 +27,7 @@ .Op Fl dnv .Op Fl D Ar macro Ns = Ns Ar value .Op Fl f Ar file -.Op Fl T Ar trace +.Op Fl P Ar system .Sh DESCRIPTION .Nm is a Simple Mail Transfer Protocol @@ -68,17 +69,21 @@ Specify an alternative configuration file. .It Fl n Configtest mode. Only check the configuration file for validity. -.It Fl T Ar trace -Show additional debug traces when one of the -.Fl v -or -.Fl d -flags are specified. -The only accepted value is -.Ar imsg , -which displays the messages exchanged between the various -.Nm -processes. +.It Fl P Ar system +Pause a specific subsystem at startup. +Normal operation can be resumed using +.Xr smtpctl 8 . +This option can be used multiple times. +The accepted values are: +.Pp +.Bl -tag -width "smtpXXX" -compact +.It mda +Do not schedule local deliveries. +.It mta +Do not schedule remote transfers. +.It smtp +Do not listen on SMTP sockets. +.El .It Fl v Produce more verbose output. .El diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c index 4e2a9169244..55659d8e2cf 100644 --- a/usr.sbin/smtpd/smtpd.c +++ b/usr.sbin/smtpd/smtpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.c,v 1.178 2012/10/15 18:32:25 eric Exp $ */ +/* $OpenBSD: smtpd.c,v 1.179 2012/10/17 16:39:49 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -199,7 +199,7 @@ usage(void) extern char *__progname; fprintf(stderr, "usage: %s [-dnv] [-D macro=value] " - "[-f file] [-T trace]\n", __progname); + "[-f file] [-P system]\n", __progname); exit(1); } |