From: Jan Engelhardt <jengelh@medozas.de>
Date: Tue, 10 Feb 2009 08:54:04 +0000 (+0100)
Subject: libxtables: recognize IP6TABLES_LIB_DIR old-style environment variable
X-Git-Tag: v1.4.3~39^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec934198bd6ee2f21171dba440ca96334b0d874b;p=thirdparty%2Fiptables.git

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>
---

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;
 }