summaryrefslogtreecommitdiff
path: root/libexec/spamd/spamd.c
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2007-03-05 21:25:30 +0000
committerBob Beck <beck@cvs.openbsd.org>2007-03-05 21:25:30 +0000
commit69c92a318e6125e28f03754014a1fe453965a6d4 (patch)
treea206e5893eed1cc9e43fbbd49f301dba2cbff584 /libexec/spamd/spamd.c
parent539c0e840d410edbf39fa9ea6c59811ca1c989b2 (diff)
remove -r option that didn't work anyway.
ok jmc@, reyk@
Diffstat (limited to 'libexec/spamd/spamd.c')
-rw-r--r--libexec/spamd/spamd.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/libexec/spamd/spamd.c b/libexec/spamd/spamd.c
index 30ece7bf9f9..16a339a276e 100644
--- a/libexec/spamd/spamd.c
+++ b/libexec/spamd/spamd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spamd.c,v 1.94 2007/03/05 02:06:14 beck Exp $ */
+/* $OpenBSD: spamd.c,v 1.95 2007/03/05 21:25:29 beck Exp $ */
/*
* Copyright (c) 2002 Theo de Raadt. All rights reserved.
@@ -102,7 +102,6 @@ void handlew(struct con *, int one);
char hostname[MAXHOSTNAMELEN];
struct syslog_data sdata = SYSLOG_DATA_INIT;
-char *reply = NULL;
char *nreply = "450";
char *spamd = "spamd IP-based SPAM blocker";
int greypipe[2];
@@ -151,8 +150,8 @@ usage(void)
"usage: %s [-45bdv] [-B maxblack] [-c maxcon] "
"[-G passtime:greyexp:whiteexp]\n"
"\t[-h hostname] [-l address] [-n name] [-p port] "
- "[-r reply] [-S secs]\n"
- "\t[-s secs] [-w window] [-Y synctarget] [-y synclisten]\n",
+ "[-S secs] [-s secs]\n"
+ "\t[-w window] [-Y synctarget] [-y synclisten]\n",
__progname);
exit(1);
@@ -531,8 +530,6 @@ bad:
void
doreply(struct con *cp)
{
- if (reply)
- snprintf(cp->obuf, cp->osize, "%s %s\n", nreply, reply);
build_reply(cp);
}
@@ -1045,9 +1042,6 @@ main(int argc, char *argv[])
sizeof(hostname))
errx(1, "-h arg too long");
break;
- case 'r':
- reply = optarg;
- break;
case 's':
i = atoi(optarg);
if (i < 0 || i > 10)