summaryrefslogtreecommitdiffstats
path: root/iptables
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2017-03-16 12:54:20 +0900
committerPablo Neira Ayuso <pablo@netfilter.org>2017-03-17 14:20:39 +0100
commit836846f0d747e1be8e37d2d43b215a68b30ea1a9 (patch)
tree2e635d8e1b5c307a8235401a3d2f1ad993988dbc /iptables
parentb91af533f4da15854893ba5cc082e1df6bcf9a97 (diff)
iptables: move XT_LOCK_NAME from CFLAGS to config.h.
This slightly simplifies configure.ac and results in more correct dependencies. Tested by running ./configure with --with-xt-lock-name and without, and using strace to verify that the right lock is used. $ 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 $ 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 Signed-off-by: Lorenzo Colitti <lorenzo@google.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables')
-rw-r--r--iptables/xshared.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/iptables/xshared.c b/iptables/xshared.c
index 383ecf2c..9b8e856e 100644
--- a/iptables/xshared.c
+++ b/iptables/xshared.c
@@ -1,3 +1,4 @@
+#include <config.h>
#include <getopt.h>
#include <errno.h>
#include <libgen.h>