diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2009-10-24 00:45:33 +0200 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2009-11-03 21:54:20 +0100 |
commit | bbe83862a5e1baf15f7c923352d4afdf59bc70e2 (patch) | |
tree | 790bfd0d6a47968e6c1ed6b2f681ec5578728463 /extensions/libipt_addrtype.c | |
parent | bf97128c7262f17a02fec41cdae75b472ba77f88 (diff) |
iptables/extensions: make bundled options work again
When using a bundled option like "-ptcp", 'argv[optind-1]' would
logically point to "-ptcp", but this is obviously not right.
'optarg' is needed instead, which if properly offset to "tcp".
Not all places change optind-based access to optarg; where
look-ahead is needed, such as for tcp's --tcp-flags option for
example, optind is ok.
References: http://bugzilla.netfilter.org/show_bug.cgi?id=611
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'extensions/libipt_addrtype.c')
-rw-r--r-- | extensions/libipt_addrtype.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extensions/libipt_addrtype.c b/extensions/libipt_addrtype.c index c3052812..ad63dcf7 100644 --- a/extensions/libipt_addrtype.c +++ b/extensions/libipt_addrtype.c @@ -107,7 +107,7 @@ addrtype_parse_v0(int c, char **argv, int invert, unsigned int *flags, xtables_error(PARAMETER_PROBLEM, "addrtype: can't specify src-type twice"); xtables_check_inverse(optarg, &invert, &optind, 0, argv); - parse_types(argv[optind-1], &info->source); + parse_types(optarg, &info->source); if (invert) info->invert_source = 1; *flags |= IPT_ADDRTYPE_OPT_SRCTYPE; @@ -117,7 +117,7 @@ addrtype_parse_v0(int c, char **argv, int invert, unsigned int *flags, xtables_error(PARAMETER_PROBLEM, "addrtype: can't specify dst-type twice"); xtables_check_inverse(optarg, &invert, &optind, 0, argv); - parse_types(argv[optind-1], &info->dest); + parse_types(optarg, &info->dest); if (invert) info->invert_dest = 1; *flags |= IPT_ADDRTYPE_OPT_DSTTYPE; @@ -142,7 +142,7 @@ addrtype_parse_v1(int c, char **argv, int invert, unsigned int *flags, xtables_error(PARAMETER_PROBLEM, "addrtype: can't specify src-type twice"); xtables_check_inverse(optarg, &invert, &optind, 0, argv); - parse_types(argv[optind-1], &info->source); + parse_types(optarg, &info->source); if (invert) info->flags |= IPT_ADDRTYPE_INVERT_SOURCE; *flags |= IPT_ADDRTYPE_OPT_SRCTYPE; @@ -152,7 +152,7 @@ addrtype_parse_v1(int c, char **argv, int invert, unsigned int *flags, xtables_error(PARAMETER_PROBLEM, "addrtype: can't specify dst-type twice"); xtables_check_inverse(optarg, &invert, &optind, 0, argv); - parse_types(argv[optind-1], &info->dest); + parse_types(optarg, &info->dest); if (invert) info->flags |= IPT_ADDRTYPE_INVERT_DEST; *flags |= IPT_ADDRTYPE_OPT_DSTTYPE; |