diff options
author | Patrick McHardy <kaber@trash.net> | 2010-11-15 11:39:55 +0100 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-11-15 11:39:55 +0100 |
commit | e84f131b5f992577119bd3679241f69ec394e0a7 (patch) | |
tree | 32d34439bc01c3102d1726d0ff1e483a4e483227 /include | |
parent | 648fd1ad68ae2ec675ac07efee80783912535404 (diff) |
Revert "libxtables: change option precedence order to be intuitive"
This reverts commit 600f38db82548a683775fd89b6e136673e924097.
The commit breaks option parsing:
iptables v1.4.9: host/network `port' not found
Try `iptables -h' or 'iptables --help' for more information.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/xtables.h.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/xtables.h.in b/include/xtables.h.in index c3d34af5..9e47c2d2 100644 --- a/include/xtables.h.in +++ b/include/xtables.h.in @@ -219,9 +219,8 @@ extern int xtables_insmod(const char *, const char *, bool); extern int xtables_load_ko(const char *, bool); extern int xtables_set_params(struct xtables_globals *xtp); extern void xtables_free_opts(int reset_offset); -extern struct option *xtables_merge_options(struct option *origopts, - struct option *oldopts, const struct option *newopts, - unsigned int *option_offset); +extern struct option *xtables_merge_options(struct option *oldopts, + const struct option *newopts, unsigned int *option_offset); extern int xtables_init_all(struct xtables_globals *xtp, uint8_t nfproto); extern struct xtables_match *xtables_find_match(const char *name, |