diff options
Diffstat (limited to 'usr.sbin/smtpd/smtpctl.8')
| -rw-r--r-- | usr.sbin/smtpd/smtpctl.8 | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/usr.sbin/smtpd/smtpctl.8 b/usr.sbin/smtpd/smtpctl.8 index 294407e7a7e..dff08c88d0c 100644 --- a/usr.sbin/smtpd/smtpctl.8 +++ b/usr.sbin/smtpd/smtpctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: smtpctl.8,v 1.18 2010/10/18 13:28:25 sthen Exp $ +.\" $OpenBSD: smtpctl.8,v 1.19 2011/07/21 23:29:24 gilles Exp $ .\" .\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> .\" @@ -14,7 +14,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: October 18 2010 $ +.Dd $Mdocdate: July 21 2011 $ .Dt SMTPCTL 8 .Os .Sh NAME @@ -47,16 +47,16 @@ Temporarily stop deliveries to local users. .It Cm pause outgoing Temporarily stop relaying and deliveries to remote users. -.It Cm remove Ar message-uid | message-id -Removes a single message, or all messages with the same message ID. +.It Cm remove Ar envelope-id +Removes a single envelope from queue. .It Cm resume incoming Resume accepting incoming sessions. .It Cm resume local Resume deliveries to local users. .It Cm resume outgoing Resume relaying and deliveries to remote users. -.It Cm schedule Ar message-uid | message-id -Marks a single message, or all messages with the same message ID, +.It Cm schedule Ar envelope-id | message-id +Marks a single envelope, or all envelopes with the same message ID, as ready for immediate delivery. .It Cm show queue Displays information concerning envelopes @@ -74,24 +74,24 @@ When receives a message, it generates a .Ar message-id for the message, and one -.Ar message-uid +.Ar envelope-id per recipient. The .Ar message-id -consists of a timestamp followed by a random identifier -that is guaranteed to be unique on the host system. +is a 32 bits random identifier that is guaranteed to be +unique on the host system. The -.Ar message-uid -consists of the +.Ar envelope-id +is a 64 bits unique identifier that encodes the .Ar message-id -followed by a random identifier that is also guaranteed -to be unique between recipients of the same message. +in the 32 upper bits and a random envelope identifier +in the 32 lower bits. .Pp A command which specifies a .Ar message-id applies to all recipients of a message; a command which specifies a -.Ar message-uid +.Ar envelope-uid applies to a specific recipient of a message. .Sh FILES .Bl -tag -width "/var/run/smtpd.sockXX" -compact |