path: root/iptables/ip6tables-standalone.c
diff options
authorPablo Neira Ayuso <>2013-07-08 19:34:12 +0200
committerPablo Neira Ayuso <>2013-07-08 19:42:04 +0200
commitd7aeda5ed45ac7ca959f12180690caa371b5b14b (patch)
tree27985d6b1cdd576c22ee35b7f7fbc69eabdfd2f2 /iptables/ip6tables-standalone.c
parent945353a25bbb2dbf88128c27a9169851da6ebf05 (diff)
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 <>
Diffstat (limited to 'iptables/ip6tables-standalone.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/iptables/ip6tables-standalone.c b/iptables/ip6tables-standalone.c
index 21b58116..656e08d5 100644
--- a/iptables/ip6tables-standalone.c
+++ b/iptables/ip6tables-standalone.c
@@ -58,7 +58,7 @@ ip6tables_main(int argc, char *argv[])
- ret = do_command6(argc, argv, &table, &handle);
+ ret = do_command6(argc, argv, &table, &handle, false);
if (ret) {
ret = ip6tc_commit(handle);