extensions: libxt_mangle: Fixes option issues

Fix option IDs and remove irrelevant flags on setting options
mandatory.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/extensions/libxt_mangle.c b/extensions/libxt_mangle.c
index 822033c8c7541f7a5989af095c44de534c015c3b..4b20feb3c65493b711938cf49a8ab5089385430c 100644 (file)
--- a/extensions/libxt_mangle.c
+++ b/extensions/libxt_mangle.c
@@ -33,22 +33,21 @@ static void mangle_help(void)
        );
 }
 
-#define MANGLE_IPS    '1'
-#define MANGLE_IPT    '2'
-#define MANGLE_DEVS   '3'
-#define MANGLE_DEVT   '4'
-#define MANGLE_TARGET '5'
+enum {
+       MANGLE_IPS    = 0,
+       MANGLE_IPT    = 1,
+       MANGLE_DEVS   = 2,
+       MANGLE_DEVT   = 3,
+       MANGLE_TARGET = 4,
+};
+
 static const struct xt_option_entry mangle_opts[] = {
-       { .name = "mangle-ip-s", .id = MANGLE_IPS, .type = XTTYPE_STRING,
-         .flags = XTOPT_MAND },
-       { .name = "mangle-ip-d", .id = MANGLE_IPT, .type = XTTYPE_STRING,
-         .flags = XTOPT_MAND },
-       { .name = "mangle-mac-s", .id = MANGLE_DEVS, .type = XTTYPE_STRING,
-         .flags = XTOPT_MAND },
-       { .name = "mangle-mac-d", .id = MANGLE_DEVT, .type = XTTYPE_STRING,
-         .flags = XTOPT_MAND },
-       { .name = "mangle-target", .id = MANGLE_TARGET, .type = XTTYPE_STRING,
-         .flags = XTOPT_MAND },
+       { .name = "mangle-ip-s", .id = MANGLE_IPS, .type = XTTYPE_STRING },
+       { .name = "mangle-ip-d", .id = MANGLE_IPT, .type = XTTYPE_STRING },
+       { .name = "mangle-mac-s", .id = MANGLE_DEVS, .type = XTTYPE_STRING },
+       { .name = "mangle-mac-d", .id = MANGLE_DEVT, .type = XTTYPE_STRING },
+       { .name = "mangle-target", .id = MANGLE_TARGET,
+         .type = XTTYPE_STRING },
        XTOPT_TABLEEND,
 };