diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2007-03-05 21:25:30 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2007-03-05 21:25:30 +0000 |
| commit | 69c92a318e6125e28f03754014a1fe453965a6d4 (patch) | |
| tree | a206e5893eed1cc9e43fbbd49f301dba2cbff584 /libexec/spamd | |
| parent | 539c0e840d410edbf39fa9ea6c59811ca1c989b2 (diff) | |
remove -r option that didn't work anyway.
ok jmc@, reyk@
Diffstat (limited to 'libexec/spamd')
| -rw-r--r-- | libexec/spamd/spamd.8 | 7 | ||||
| -rw-r--r-- | libexec/spamd/spamd.c | 12 |
2 files changed, 4 insertions, 15 deletions
diff --git a/libexec/spamd/spamd.8 b/libexec/spamd/spamd.8 index 4a4d1837ea9..4a5b76e2d2b 100644 --- a/libexec/spamd/spamd.8 +++ b/libexec/spamd/spamd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: spamd.8,v 1.88 2007/03/05 16:59:54 reyk Exp $ +.\" $OpenBSD: spamd.8,v 1.89 2007/03/05 21:25:29 beck Exp $ .\" .\" Copyright (c) 2002 Theo de Raadt. All rights reserved. .\" @@ -42,7 +42,6 @@ .Op Fl l Ar address .Op Fl n Ar name .Op Fl p Ar port -.Op Fl r Ar reply .Op Fl S Ar secs .Op Fl s Ar secs .Op Fl w Ar window @@ -160,10 +159,6 @@ The default port is found by looking for the named service .Dq spamd using .Xr getservbyname 3 . -.It Fl r Ar reply -For blacklisted entries, the SMTP error to return to the spammer, -e.g. 450, 451, 550. -This defaults to 450. .It Fl S Ar secs Stutter at greylisted connections for the specified amount of seconds, after which the connection is not stuttered at. 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) |