diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-08 19:34:12 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-08 19:42:04 +0200 |
| commit | d7aeda5ed45ac7ca959f12180690caa371b5b14b (patch) | |
| tree | 27985d6b1cdd576c22ee35b7f7fbc69eabdfd2f2 /iptables/iptables-standalone.c | |
| parent | 945353a25bbb2dbf88128c27a9169851da6ebf05 (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 <pablo@netfilter.org>
Diffstat (limited to 'iptables/iptables-standalone.c')
| -rw-r--r-- | iptables/iptables-standalone.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/iptables/iptables-standalone.c b/iptables/iptables-standalone.c index 683a44a5..4da1d7f8 100644 --- a/iptables/iptables-standalone.c +++ b/iptables/iptables-standalone.c @@ -58,7 +58,7 @@ iptables_main(int argc, char *argv[]) init_extensions4(); #endif - ret = do_command4(argc, argv, &table, &handle); + ret = do_command4(argc, argv, &table, &handle, false); if (ret) { ret = iptc_commit(handle); iptc_free(handle); |