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_physdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extensions/libxt_physdev.c') diff --git a/extensions/libxt_physdev.c b/extensions/libxt_physdev.c index bd107669..5382ab60 100644 --- a/extensions/libxt_physdev.c +++ b/extensions/libxt_physdev.c @@ -44,7 +44,7 @@ physdev_parse(int c, char **argv, int invert, unsigned int *flags, if (*flags & XT_PHYSDEV_OP_IN) goto multiple_use; xtables_check_inverse(optarg, &invert, &optind, 0, argv); - xtables_parse_interface(argv[optind-1], info->physindev, + xtables_parse_interface(optarg, info->physindev, (unsigned char *)info->in_mask); if (invert) info->invert |= XT_PHYSDEV_OP_IN; @@ -56,7 +56,7 @@ physdev_parse(int c, char **argv, int invert, unsigned int *flags, if (*flags & XT_PHYSDEV_OP_OUT) goto multiple_use; xtables_check_inverse(optarg, &invert, &optind, 0, argv); - xtables_parse_interface(argv[optind-1], info->physoutdev, + xtables_parse_interface(optarg, info->physoutdev, (unsigned char *)info->out_mask); if (invert) info->invert |= XT_PHYSDEV_OP_OUT; -- cgit v1.2.3