From e84f131b5f992577119bd3679241f69ec394e0a7 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 15 Nov 2010 11:39:55 +0100 Subject: 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 --- include/xtables.h.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include/xtables.h.in') 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, -- cgit v1.2.3