diff options
| author | Sunil Nimmagadda <sunil@cvs.openbsd.org> | 2015-10-15 08:18:24 +0000 |
|---|---|---|
| committer | Sunil Nimmagadda <sunil@cvs.openbsd.org> | 2015-10-15 08:18:24 +0000 |
| commit | 6c0c0d948d17af9a7a5cc4a6f8d187bfedf98b1d (patch) | |
| tree | de9eadff8d19af458f869a50830453938b127097 /usr.sbin/smtpd | |
| parent | aeeb91a447bd00da517adc5508f9d0337d3cb075 (diff) | |
Let "all" as an argument for "resume envelope", "pause envelope"
and "remove" subcommands.
seems potentially useful millert@, Ok gilles@
Diffstat (limited to 'usr.sbin/smtpd')
| -rw-r--r-- | usr.sbin/smtpd/smtpctl.8 | 10 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpctl.c | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/smtpctl.8 b/usr.sbin/smtpd/smtpctl.8 index 13842b3960e..add7b3159c8 100644 --- a/usr.sbin/smtpd/smtpctl.8 +++ b/usr.sbin/smtpd/smtpctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: smtpctl.8,v 1.51 2015/08/16 22:26:11 jmc Exp $ +.\" $OpenBSD: smtpctl.8,v 1.52 2015/10/15 08:18:23 sunil Exp $ .\" .\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> .\" Copyright (c) 2012 Gilles Chehade <gilles@poolp.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: August 16 2015 $ +.Dd $Mdocdate: October 15 2015 $ .Dt SMTPCTL 8 .Os .Sh NAME @@ -104,6 +104,8 @@ Generated bounces. .It Cm pause envelope Ar envelope-id | message-id Temporarily suspend scheduling for the envelope with the given ID, or all envelopes with the given message ID. +.It Cm pause envelope all +Temporarily suspend scheduling all the envelopes. .It Cm pause mda Temporarily stop deliveries to local users. .It Cm pause mta @@ -124,9 +126,13 @@ imsg, to profile cost of event handlers .El .It Cm remove Ar envelope-id | message-id Remove a single envelope, or all envelopes with the same message ID. +.It Cm remove all +Remove all envelopes. .It Cm resume envelope Ar envelope-id | message-id Resume scheduling for the envelope with the given ID, or all envelopes with the given message ID. +.It Cm resume envelope all +Resume scheduling all the envelopes. .It Cm resume mda Resume deliveries to local users. .It Cm resume mta diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c index 725c66c4efd..a198a952886 100644 --- a/usr.sbin/smtpd/smtpctl.c +++ b/usr.sbin/smtpd/smtpctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpctl.c,v 1.130 2015/10/13 08:06:22 gilles Exp $ */ +/* $OpenBSD: smtpctl.c,v 1.131 2015/10/15 08:18:23 sunil Exp $ */ /* * Copyright (c) 2013 Eric Faurot <eric@openbsd.org> @@ -955,14 +955,17 @@ main(int argc, char **argv) cmd_install("monitor", do_monitor); cmd_install("pause envelope <evpid>", do_pause_envelope); cmd_install("pause envelope <msgid>", do_pause_envelope); + cmd_install("pause envelope all", do_pause_envelope); cmd_install("pause mda", do_pause_mda); cmd_install("pause mta", do_pause_mta); cmd_install("pause smtp", do_pause_smtp); cmd_install("profile <str>", do_profile); cmd_install("remove <evpid>", do_remove); cmd_install("remove <msgid>", do_remove); + cmd_install("remove all", do_remove); cmd_install("resume envelope <evpid>", do_resume_envelope); cmd_install("resume envelope <msgid>", do_resume_envelope); + cmd_install("resume envelope all", do_resume_envelope); cmd_install("resume mda", do_resume_mda); cmd_install("resume mta", do_resume_mta); cmd_install("resume route <routeid>", do_resume_route); |