From 21b41eea4724c57d2b6e5998cf38255046e43ad3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 11 Feb 2008 01:02:00 +0100 Subject: Combine IP{,6}T_LIB_DIR into XTABLES_LIBDIR --- iptables-restore.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'iptables-restore.c') diff --git a/iptables-restore.c b/iptables-restore.c index b751d2c8..f556fa54 100644 --- a/iptables-restore.c +++ b/iptables-restore.c @@ -132,9 +132,14 @@ main(int argc, char *argv[]) program_version = IPTABLES_VERSION; line = 0; - lib_dir = getenv("IPTABLES_LIB_DIR"); - if (!lib_dir) - lib_dir = IPT_LIB_DIR; + lib_dir = getenv("XTABLES_LIBDIR"); + if (lib_dir == NULL) { + lib_dir = getenv("IPTABLES_LIB_DIR"); + if (lib_dir != NULL) + fprintf(stderr, "IPTABLES_LIB_DIR is deprecated\n"); + } + if (lib_dir == NULL) + lib_dir = XTABLES_LIBDIR; #ifdef NO_SHARED_LIBS init_extensions(); -- cgit v1.2.3