From b91af533f4da15854893ba5cc082e1df6bcf9a97 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Tue, 14 Mar 2017 17:55:50 +0900 Subject: iptables: set the path of the lock file via a configure option. Currently the iptables lock is hardcoded as "/run/xtables.lock". Allow users to change this path using the --with-xt-lock-name option to ./configure option. This is useful on systems like Android which do not have /run. Tested on Ubuntu, as follows: 1. By default, the lock is placed in /run/xtables.lock: $ make distclean-recursive && ./autogen.sh && ./configure --disable-nftables --prefix /tmp/iptables && make -j64 && make install && sudo strace -e open,flock /tmp/iptables/sbin/iptables -L foo ... open("/run/xtables.lock", O_RDONLY|O_CREAT, 0600) = 3 flock(3, LOCK_EX|LOCK_NB) = 0 iptables: No chain/target/match by that name. 2. Specifying the lock results in the expected location being used: $ make distclean-recursive && ./autogen.sh && \ ./configure --disable-nftables --prefix /tmp/iptables \ --with-xt-lock-name=/tmp/iptables/run/xtables.lock && make -j64 && make install && sudo strace -e open,flock /tmp/iptables/sbin/iptables -L foo ... open("/tmp/iptables/run/xtables.lock", O_RDONLY|O_CREAT, 0600) = 3 flock(3, LOCK_EX|LOCK_NB) = 0 iptables: No chain/target/match by that name. Signed-off-by: Lorenzo Colitti Signed-off-by: Pablo Neira Ayuso --- iptables/xshared.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'iptables/xshared.c') diff --git a/iptables/xshared.c b/iptables/xshared.c index f0a5ddd0..383ecf2c 100644 --- a/iptables/xshared.c +++ b/iptables/xshared.c @@ -17,8 +17,6 @@ #include #include "xshared.h" -#define XT_LOCK_NAME "/run/xtables.lock" - /* * Print out any special helps. A user might like to be able to add a --help * to the commandline, and see expected results. So we call help for all -- cgit v1.2.3