From bbe83862a5e1baf15f7c923352d4afdf59bc70e2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 24 Oct 2009 00:45:33 +0200 Subject: 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 --- extensions/libxt_string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extensions/libxt_string.c') 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; -- cgit v1.2.3