diff options
author | Patrick McHardy <kaber@trash.net> | 2011-04-12 16:05:28 +0200 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2011-04-12 16:05:28 +0200 |
commit | 884d2675f1a880ffcc072da69ab8c9aaea2a3bce (patch) | |
tree | a92ad8e4d0850355a6aea31ef0d77b371666ffa9 | |
parent | c0431520a5f91e754cec8d827d8f978da4241717 (diff) | |
parent | aeb8af909befedbfc85e9f184471b219e4ea191a (diff) |
Merge branch 'master' of vishnu.netfilter.org:/data/git/iptables
-rw-r--r-- | extensions/libxt_set.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/extensions/libxt_set.h b/extensions/libxt_set.h index 6b936911..4ac84fa9 100644 --- a/extensions/libxt_set.h +++ b/extensions/libxt_set.h @@ -114,7 +114,7 @@ parse_dirs_v0(const char *opt_arg, struct xt_set_info_v0 *info) if (tmp) xtables_error(PARAMETER_PROBLEM, "Can't be more src/dst options than %i.", - IPSET_DIM_MAX - 1); + IPSET_DIM_MAX); free(saved); } @@ -124,9 +124,8 @@ parse_dirs(const char *opt_arg, struct xt_set_info *info) { char *saved = strdup(opt_arg); char *ptr, *tmp = saved; - int i = 0; - while (i < (IPSET_DIM_MAX - 1) && tmp != NULL) { + while (info->dim < IPSET_DIM_MAX && tmp != NULL) { info->dim++; ptr = strsep(&tmp, ","); if (strncmp(ptr, "src", 3) == 0) @@ -139,7 +138,7 @@ parse_dirs(const char *opt_arg, struct xt_set_info *info) if (tmp) xtables_error(PARAMETER_PROBLEM, "Can't be more src/dst options than %i.", - IPSET_DIM_MAX - 1); + IPSET_DIM_MAX); free(saved); } |