]> git.ipfire.org Git - thirdparty/iptables.git/commit
ip{6}tables-restore: fix breakage due to new locking approach
authorPablo Neira Ayuso <pablo@netfilter.org>
Mon, 8 Jul 2013 17:34:12 +0000 (19:34 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 8 Jul 2013 17:42:04 +0000 (19:42 +0200)
commitd7aeda5ed45ac7ca959f12180690caa371b5b14b
tree27985d6b1cdd576c22ee35b7f7fbc69eabdfd2f2
parent945353a25bbb2dbf88128c27a9169851da6ebf05
ip{6}tables-restore: fix breakage due to new locking approach

Since (93587a0 ip[6]tables: Add locking to prevent concurrent instances),
ip{6}tables-restore does not work anymore:

iptables-restore < x
Another app is currently holding the xtables lock. Perhaps you want to use the -w option?

do_command{6}(...) is called from ip{6}tables-restore for every iptables
command contained in the rule-set file. Thus, hitting the lock error
after the second command.

Fix it by bypassing the locking in the ip{6}tables-restore path.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/ip6tables.h
include/iptables.h
iptables/ip6tables-restore.c
iptables/ip6tables-standalone.c
iptables/ip6tables.c
iptables/iptables-restore.c
iptables/iptables-standalone.c
iptables/iptables.c