cmdline options and descriptions in alphabetical order in usage() and manpage

add arguments to the flags that take them in the DESCRIPTION
add "inet" to the rdr rule example to match etc/pf.conf example

ok dhartmei@ henning@

2 files changed, 15 insertions, 15 deletions

diff --git a/libexec/spamd/spamd.8 b/libexec/spamd/spamd.8
index d38c779d9e6..acaa853cfeb 100644
--- a/libexec/spamd/spamd.8
+++ b/libexec/spamd/spamd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: spamd.8,v 1.32 2003/03/18 13:05:24 david Exp $
+.\"	$OpenBSD: spamd.8,v 1.33 2003/03/20 01:39:36 david Exp $
 .\"
 .\" Copyright (c) 2002 Theo de Raadt.  All rights reserved.
 .\"
@@ -31,10 +31,10 @@
 .Sh SYNOPSIS
 .Nm spamd
 .Op Fl 45d
-.Op Fl r Ar reply
 .Op Fl c Ar maxcon
-.Op Fl p Ar port
 .Op Fl n Ar name
+.Op Fl p Ar port
+.Op Fl r Ar reply
 .Sh DESCRIPTION
 .Nm
 is a fake
@@ -52,19 +52,18 @@ The options are as follows:
 Return error code 450 to the spammer (default).
 .It Fl 5
 Return error code 550 to the spammer.
+.It Fl c Ar maxcon
+The maximum number of concurrent connections to allow.
+The default is 200.
 .It Fl d
 Debug mode.
 .Nm
 does not
 .Xr fork 2
 into the background.
-.It Fl r
-The SMTP error to return to the spammer, i.e. 450, 451, 550.
-This defaults to 450.
-.It Fl c
-The maximum number of concurrent connections to allow.
-The default is 200.
-.It Fl p
+.It Fl n Ar name
+The SMTP version banner that is reported upon initial connection.
+.It Fl p Ar port
 Specify a different port number from the default port that
 .Nm
 should listen for redirected SMTP connections on.
@@ -72,8 +71,9 @@ The default port is found by looking for the named service
 .Em spamd
 using
 .Xr getservbyname 5 .
-.It Fl n
-The SMTP version banner that is reported upon initial connection.
+.It Fl r Ar reply
+The SMTP error to return to the spammer, i.e. 450, 451, 550.
+This defaults to 450.
 .El
 .Pp
 .Nm
@@ -112,7 +112,7 @@ The rules can be loaded into a
 to simplify handling.
 .Bd -literal
     table <spamd> persist
-    rdr proto tcp from <spamd> to any port smtp -> 127.0.0.1 port 8025
+    rdr inet proto tcp from <spamd> to any port smtp -> 127.0.0.1 port 8025
 .Ed
 .Pp
 Any addresses in table
diff --git a/libexec/spamd/spamd.c b/libexec/spamd/spamd.c
index e48492874b1..f64e8c01860 100644
--- a/libexec/spamd/spamd.c
+++ b/libexec/spamd/spamd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spamd.c,v 1.25 2003/03/13 21:20:42 beck Exp $	*/
+/*	$OpenBSD: spamd.c,v 1.26 2003/03/20 01:39:36 david Exp $	*/
 
 /*
  * Copyright (c) 2002 Theo de Raadt.  All rights reserved.
@@ -118,7 +118,7 @@ void
 usage(void)
 {
 	fprintf(stderr,
-	    "usage: spamd [-45d] [-r reply] [-c maxcon] [-p port] [-n name]\n");
+	    "usage: spamd [-45d] [-c maxcon] [-n name] [-p port] [-r reply]\n");
 	exit(1);
 }