From 5120ab007946d089fcf33148787ad88afbdbaed9 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@medozas.de>
Date: Mon, 7 Jul 2008 17:56:20 +0200
Subject: [PATCH] xt_quota2: minor fixes, merge into main config files

---
 extensions/Kbuild           | 1 +
 extensions/Mbuild           | 1 +
 extensions/libxt_quota2.c   | 4 ++--
 extensions/xt_quota2.Kbuild | 3 ---
 extensions/xt_quota2.Mbuild | 3 ---
 mconfig                     | 1 +
 mconfig.quota2              | 3 ---
 7 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100644 extensions/xt_quota2.Kbuild
 delete mode 100644 extensions/xt_quota2.Mbuild
 delete mode 100644 mconfig.quota2

diff --git a/extensions/Kbuild b/extensions/Kbuild
index 3dc08f9..540699b 100644
--- a/extensions/Kbuild
+++ b/extensions/Kbuild
@@ -16,6 +16,7 @@ obj-${build_condition} += xt_condition.o
 obj-${build_geoip}    += xt_geoip.o
 obj-${build_ipp2p}    += xt_ipp2p.o
 obj-${build_portscan} += xt_portscan.o
+obj-${build_quota2}    += xt_quota2.o
 
 -include ${M}/*.Kbuild
 -include ${M}/Kbuild.*
diff --git a/extensions/Mbuild b/extensions/Mbuild
index 0ab79bc..dbc25b0 100644
--- a/extensions/Mbuild
+++ b/extensions/Mbuild
@@ -9,3 +9,4 @@ obj-${build_condition} += libxt_condition.so
 obj-${build_geoip}    += libxt_geoip.so
 obj-${build_ipp2p}    += libxt_ipp2p.so
 obj-${build_portscan} += libxt_portscan.so
+obj-${build_quota2}    += libxt_quota2.so
diff --git a/extensions/libxt_quota2.c b/extensions/libxt_quota2.c
index 71ee70c..858c60d 100644
--- a/extensions/libxt_quota2.c
+++ b/extensions/libxt_quota2.c
@@ -23,7 +23,7 @@ static const struct option quota_mt2_opts[] = {
 	{.name = "grow",    .has_arg = false, .val = 'g'},
 	{.name = "name",    .has_arg = true,  .val = 'n'},
 	{.name = "quota",   .has_arg = true,  .val = 'q'},
-	{.name = "packets", .has_arg = true,  .val = 'p'},
+	{.name = "packets", .has_arg = false, .val = 'p'},
 	{NULL},
 };
 
@@ -60,7 +60,7 @@ quota_mt2_parse(int c, char **argv, int invert, unsigned int *flags,
 		*flags |= FL_NAME;
 		return true;
 	case 'p':
-		param_act(P_ONLY_ONCE, "quota", "--packets", *flags & FL_PACKETS);
+		param_act(P_ONLY_ONCE, "quota", "--packets", *flags & FL_PACKET);
 		param_act(P_NO_INVERT, "quota", "--packets", invert);
 		info->flags |= XT_QUOTA_PACKET;
 		*flags |= FL_PACKET;
diff --git a/extensions/xt_quota2.Kbuild b/extensions/xt_quota2.Kbuild
deleted file mode 100644
index e8d7ad1..0000000
--- a/extensions/xt_quota2.Kbuild
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- Makefile -*-
-
-obj-${build_quota2} += xt_quota2.o
diff --git a/extensions/xt_quota2.Mbuild b/extensions/xt_quota2.Mbuild
deleted file mode 100644
index 1481989..0000000
--- a/extensions/xt_quota2.Mbuild
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- Makefile -*-
-
-obj-${build_quota2} += libxt_quota2.so
diff --git a/mconfig b/mconfig
index 7b50b1a..a68d4c4 100644
--- a/mconfig
+++ b/mconfig
@@ -11,3 +11,4 @@ build_condition=m
 build_geoip=m
 build_ipp2p=m
 build_portscan=m
+build_quota2=m
diff --git a/mconfig.quota2 b/mconfig.quota2
deleted file mode 100644
index 5c3fd32..0000000
--- a/mconfig.quota2
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- Makefile -*-
-
-build_quota2=m