summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2004-03-16 09:19:26 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2004-03-16 09:19:26 +0000
commit73c132b0930520f7776a000a5d3e09e5c9356d00 (patch)
tree93241e1a8afd555df891e7da3384d0af07d833e7
parent6993fd9b5643903115bb0ee6e48d940b538fdba1 (diff)
sort options and escape a minus sign;
-rw-r--r--libexec/spamd/spamd.814
-rw-r--r--libexec/spamd/spamd.c4
2 files changed, 9 insertions, 9 deletions
diff --git a/libexec/spamd/spamd.8 b/libexec/spamd/spamd.8
index 174570cbc0c..7b0084ac96c 100644
--- a/libexec/spamd/spamd.8
+++ b/libexec/spamd/spamd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: spamd.8,v 1.48 2004/03/15 21:53:39 beck Exp $
+.\" $OpenBSD: spamd.8,v 1.49 2004/03/16 09:19:25 jmc Exp $
.\"
.\" Copyright (c) 2002 Theo de Raadt. All rights reserved.
.\"
@@ -32,8 +32,8 @@
.Nm spamd
.Bk -words
.Op Fl 45dgv
-.Op Fl b Ar address
.Op Fl B Ar maxblack
+.Op Fl b Ar address
.Op Fl c Ar maxcon
.Op Fl G Ar passtime:greyexp:whiteexp
.Op Fl n Ar name
@@ -58,6 +58,11 @@ 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 B Ar maxblack
+The maximum number of concurrent blacklisted connections to allow in
+greylisting mode.
+This value may not be greater than maxcon (see below).
+The default is maxcon \- 100
.It Fl b Ar address
Specify the local address to which
.Nm
@@ -66,11 +71,6 @@ is to
By default
.Nm
listens on all local addresses.
-.It Fl B Ar maxblack
-The maximum number of concurrent blacklisted connections to allow in
-greylisting mode.
-This value may not be greater than maxcon (see below).
-The default is maxcon - 100
.It Fl c Ar maxcon
The maximum number of concurrent connections to allow.
The default is 800.
diff --git a/libexec/spamd/spamd.c b/libexec/spamd/spamd.c
index 310f076c414..3274bc38327 100644
--- a/libexec/spamd/spamd.c
+++ b/libexec/spamd/spamd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spamd.c,v 1.62 2004/03/15 21:53:39 beck Exp $ */
+/* $OpenBSD: spamd.c,v 1.63 2004/03/16 09:19:25 jmc Exp $ */
/*
* Copyright (c) 2002 Theo de Raadt. All rights reserved.
@@ -138,7 +138,7 @@ void
usage(void)
{
fprintf(stderr,
- "usage: spamd [-45dgv] [-b address] [-B maxblack] [-c maxcon]\n");
+ "usage: spamd [-45dgv] [-B maxblack] [-b address] [-c maxcon]\n");
fprintf(stderr,
" [-G mins:hours:hours] [-n name] [-p port]\n");
fprintf(stderr,