summaryrefslogtreecommitdiffstats
path: root/xtables.c
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2009-02-10 09:54:04 +0100
committerJan Engelhardt <jengelh@medozas.de>2009-02-10 10:03:15 +0100
commitec934198bd6ee2f21171dba440ca96334b0d874b (patch)
tree9a423c2252c50c1b6ac043f361c09074353b0a3d /xtables.c
parent1eb619f3a0508d62847c311e69a09f4a8534c4df (diff)
libxtables: recognize IP6TABLES_LIB_DIR old-style environment variable
Commit v1.4.3-rc1-47-g300e290 tried to consolidate the environment variable presence checking code into xtables.c, but missed adding IP6TABLES_LIB_DIR to libxtables. Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'xtables.c')
-rw-r--r--xtables.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/xtables.c b/xtables.c
index 6c954754..c8988893 100644
--- a/xtables.c
+++ b/xtables.c
@@ -110,6 +110,19 @@ void xtables_init(void)
"use XTABLES_LIBDIR.\n");
return;
}
+ /*
+ * Well yes, IP6TABLES_LIB_DIR is of lower priority over
+ * IPTABLES_LIB_DIR since this moved to libxtables; I think that is ok
+ * for these env vars are deprecated anyhow, and in light of the
+ * (shared) libxt_*.so files, makes less sense to have
+ * IPTABLES_LIB_DIR != IP6TABLES_LIB_DIR.
+ */
+ xtables_libdir = getenv("IP6TABLES_LIB_DIR");
+ if (xtables_libdir != NULL) {
+ fprintf(stderr, "IP6TABLES_LIB_DIR is deprecated, "
+ "use XTABLES_LIBDIR.\n");
+ return;
+ }
xtables_libdir = XTABLES_LIBDIR;
}