From 32b8e61e4e5bd405d9ad07bf9468498dfbb19f9e Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@medozas.de>
Date: Fri, 23 Jul 2010 21:16:14 +0200
Subject: all: consistent syntax use in struct option

Try to inhibit copypasting old stuff.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 extensions/libxt_quota.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'extensions/libxt_quota.c')

diff --git a/extensions/libxt_quota.c b/extensions/libxt_quota.c
index ac7c686e..b6bab93a 100644
--- a/extensions/libxt_quota.c
+++ b/extensions/libxt_quota.c
@@ -3,6 +3,7 @@
  *
  * Sam Johnston <samj@samj.net>
  */
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -12,8 +13,8 @@
 #include <linux/netfilter/xt_quota.h>
 
 static const struct option quota_opts[] = {
-	{"quota", 1, NULL, '1'},
-	{ .name = NULL }
+	{.name = "quota", .has_arg = true, .val = '1'},
+	XT_GETOPT_TABLEEND,
 };
 
 static void quota_help(void)
-- 
cgit v1.2.3


From 422342e47c18e70757231f2210b13df8e1f5931c Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo@gmail.com>
Date: Mon, 2 Aug 2010 18:03:20 +0200
Subject: libxt_quota: don't ignore the quota value on deletion

Don't ignore the quota value on deletion, then we can remove a special
rule everytime.

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
 extensions/libxt_quota.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'extensions/libxt_quota.c')

diff --git a/extensions/libxt_quota.c b/extensions/libxt_quota.c
index b6bab93a..cfd975d0 100644
--- a/extensions/libxt_quota.c
+++ b/extensions/libxt_quota.c
@@ -83,7 +83,7 @@ static struct xtables_match quota_match = {
 	.name		= "quota",
 	.version	= XTABLES_VERSION,
 	.size		= XT_ALIGN(sizeof (struct xt_quota_info)),
-	.userspacesize	= offsetof(struct xt_quota_info, quota),
+	.userspacesize	= offsetof(struct xt_quota_info, master),
 	.help		= quota_help,
 	.parse		= quota_parse,
 	.print		= quota_print,
-- 
cgit v1.2.3