xt_quota2: minor fixes, merge into main config files

diff --git a/extensions/Kbuild b/extensions/Kbuild
index 3dc08f93f7b0932019289195fc4862f2e8eb536c..540699b3ccca179ac0d8a69993d4662d75981ed2 100644 (file)
--- 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 0ab79bc4a3c0b076a0c13a021ee5b620a2b2fd18..dbc25b0e7f9c2a23d74e94730766bb586453ab37 100644 (file)
--- 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 71ee70c5c90c091f5aad08e43fb21a0a1df93947..858c60dcfd7fe8b9c7d2e5001fbbdfc8f31b0727 100644 (file)
--- 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 (file)
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 (file)
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 7b50b1a958bc22209d48ac8bf1fe529f86736dad..a68d4c46e97e8c49fb446383d2f4f4c0afdb6bf0 100644 (file)
--- 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 (file)
index 5c3fd32..0000000
--- a/mconfig.quota2
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- Makefile -*-
-
-build_quota2=m