summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2008-09-01 14:28:12 +0200
committerPatrick McHardy <kaber@trash.net>2008-09-01 14:28:12 +0200
commita4be7cb319212ba7907a541bbb5f9af1ffa7db0f (patch)
tree2bd24d943a3036acc2afa1d161e0d2f5183735d8
parent9e812285f071696c867adfb344dc0eb19af7136a (diff)
libxt_recent: do allow --rttl for --update
Tony Ho noticed a too-strict check in xt_recent, so here is a fix. Reported-by: Tony Ho <iptables@iblink.com.cn> Signed-off-by: Jan Engelhardt <jengelh@medozas.de> Signed-off-by: Patrick McHardy <kaber@trash.net>
-rw-r--r--extensions/libipt_recent.c2
-rw-r--r--extensions/libipt_recent.man2
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/libipt_recent.c b/extensions/libipt_recent.c
index 94f246a6..7281fe5f 100644
--- a/extensions/libipt_recent.c
+++ b/extensions/libipt_recent.c
@@ -165,7 +165,7 @@ static void recent_check(unsigned int flags)
"recent: you must specify one of `--set', `--rcheck' "
"`--update' or `--remove'");
if ((flags & IPT_RECENT_TTL) &&
- (flags & (IPT_RECENT_SET | IPT_RECENT_REMOVE | IPT_RECENT_UPDATE)))
+ (flags & (IPT_RECENT_SET | IPT_RECENT_REMOVE)))
exit_error(PARAMETER_PROBLEM,
"recent: --rttl may only be used with --rcheck or "
"--update");
diff --git a/extensions/libipt_recent.man b/extensions/libipt_recent.man
index 02432bac..d5bdaa0b 100644
--- a/extensions/libipt_recent.man
+++ b/extensions/libipt_recent.man
@@ -50,7 +50,7 @@ than or equal to the given value. This option may be used along with
number of hits within a specific time frame.
.TP
\fB--rttl\fR
-This option must be used in conjunction with one of \fB--rcheck\fR or
+This option may only be used in conjunction with one of \fB--rcheck\fR or
\fB--update\fR. When used, this will narrow the match to only happen
when the address is in the list and the TTL of the current packet
matches that of the packet which hit the \fB--set\fR rule. This may be