summaryrefslogtreecommitdiffstats
path: root/extensions/libxt_string.c
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2009-10-24 00:45:33 +0200
committerJan Engelhardt <jengelh@medozas.de>2009-11-03 21:54:20 +0100
commitbbe83862a5e1baf15f7c923352d4afdf59bc70e2 (patch)
tree790bfd0d6a47968e6c1ed6b2f681ec5578728463 /extensions/libxt_string.c
parentbf97128c7262f17a02fec41cdae75b472ba77f88 (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/libxt_string.c')
-rw-r--r--extensions/libxt_string.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/libxt_string.c b/extensions/libxt_string.c
index ce2d30d9..df6302e8 100644
--- a/extensions/libxt_string.c
+++ b/extensions/libxt_string.c
@@ -203,7 +203,7 @@ string_parse(int c, char **argv, int invert, unsigned int *flags,
xtables_error(PARAMETER_PROBLEM,
"Can't specify multiple --string");
xtables_check_inverse(optarg, &invert, &optind, 0, argv);
- parse_string(argv[optind-1], stringinfo);
+ parse_string(optarg, stringinfo);
if (invert) {
if (revision == 0)
stringinfo->u.v0.invert = 1;
@@ -219,7 +219,7 @@ string_parse(int c, char **argv, int invert, unsigned int *flags,
"Can't specify multiple --hex-string");
xtables_check_inverse(optarg, &invert, &optind, 0, argv);
- parse_hex_string(argv[optind-1], stringinfo); /* sets length */
+ parse_hex_string(optarg, stringinfo); /* sets length */
if (invert) {
if (revision == 0)
stringinfo->u.v0.invert = 1;