From: Jan Engelhardt <jengelh@medozas.de>
To: kaber@trash.net
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 3/9] libxt_quota: require --quota to be specified
Date: Sun, 27 Feb 2011 02:31:13 +0100 [thread overview]
Message-ID: <1298770280-7652-4-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1298770280-7652-1-git-send-email-jengelh@medozas.de>
It is pretty pointless to use -m quota without specifying --quota.
There would be nothing left to count down on.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
extensions/libxt_quota.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/extensions/libxt_quota.c b/extensions/libxt_quota.c
index e6ed9bc..e3699ad 100644
--- a/extensions/libxt_quota.c
+++ b/extensions/libxt_quota.c
@@ -72,12 +72,19 @@ quota_parse(int c, char **argv, int invert, unsigned int *flags,
if (invert)
info->flags |= XT_QUOTA_INVERT;
-
+ *flags |= 1;
break;
}
return 1;
}
+static void quota_check(unsigned int flags)
+{
+ if (flags == 0)
+ xtables_error(PARAMETER_PROBLEM,
+ "quota: the --quota argument must be specified\n");
+}
+
static struct xtables_match quota_match = {
.family = NFPROTO_UNSPEC,
.name = "quota",
@@ -86,6 +93,7 @@ static struct xtables_match quota_match = {
.userspacesize = offsetof(struct xt_quota_info, master),
.help = quota_help,
.parse = quota_parse,
+ .final_check = quota_check,
.print = quota_print,
.save = quota_save,
.extra_opts = quota_opts,
--
1.7.1
next prev parent reply other threads:[~2011-02-27 1:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-27 1:31 iptables: docs & address parsing Jan Engelhardt
2011-02-27 1:31 ` [PATCH 1/9] doc: mention other possible nf_loggers for TRACE Jan Engelhardt
2011-02-27 1:31 ` [PATCH 2/9] doc: fix odd partial sentence in libipt_TTL Jan Engelhardt
2011-02-27 1:31 ` Jan Engelhardt [this message]
2011-02-27 1:31 ` [PATCH 4/9] doc: rateest options can be optional Jan Engelhardt
2011-02-27 1:31 ` [PATCH 5/9] libxtables: fix memory scribble beyond end of array Jan Engelhardt
2011-02-27 1:31 ` [PATCH 6/9] libxtables: avoid confusing use of ai_protocol=IPPROTO_IPV6 Jan Engelhardt
2011-02-27 1:31 ` [PATCH 7/9] xtables: fix excessive memory allocation in host_to_ipaddr Jan Engelhardt
2011-02-27 1:31 ` [PATCH 8/9] xtables: fix the broken detection/removal of redundant addresses Jan Engelhardt
2011-02-27 1:31 ` [PATCH 9/9] xtables: use all IPv6 addresses resolved from a hostname Jan Engelhardt
2011-02-27 15:19 ` iptables: docs & address parsing Patrick McHardy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1298770280-7652-4-git-send-email-jengelh@medozas.de \
--to=jengelh@medozas.de \
--cc=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).