env: augment deprecation notice

Tell the user what to use instead of IP*TABLES_LIBDIR.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/ip6tables-restore.c b/ip6tables-restore.c
index 01bccf7742922da4906940fae7bc3f9591c701bc..a84c2e3e36b6887f16dd1b1b95a0aa6244555637 100644 (file)
--- a/ip6tables-restore.c
+++ b/ip6tables-restore.c
@@ -133,7 +133,8 @@ int main(int argc, char *argv[])
        if (lib_dir == NULL) {
                lib_dir = getenv("IP6TABLES_LIB_DIR");
                if (lib_dir != NULL)
-                       fprintf(stderr, "IP6TABLES_LIB_DIR is deprecated\n");
+                       fprintf(stderr, "IP6TABLES_LIB_DIR is deprecated, "
+                               "use XTABLES_LIBDIR.\n");
        }
        if (lib_dir == NULL)
                lib_dir = XTABLES_LIBDIR;

diff --git a/ip6tables-save.c b/ip6tables-save.c
index d5f8e54b4c846983e09c3477efcf6f81344cdcb0..11ef8c48d75d75a77784e4706b193d79d797a617 100644 (file)
--- a/ip6tables-save.c
+++ b/ip6tables-save.c
@@ -143,7 +143,8 @@ int main(int argc, char *argv[])
        if (lib_dir == NULL) {
                lib_dir = getenv("IP6TABLES_LIB_DIR");
                if (lib_dir != NULL)
-                       fprintf(stderr, "IP6TABLES_LIB_DIR is deprecated\n");
+                       fprintf(stderr, "IP6TABLES_LIB_DIR is deprecated, "
+                               "use XTABLES_LIBDIR.\n");
        }
        if (lib_dir == NULL)
                lib_dir = XTABLES_LIBDIR;

diff --git a/ip6tables-standalone.c b/ip6tables-standalone.c
index 11c7cb0a18f555b9deebe2e2c12097b9fffa212b..f4b1f18f1e21e01ad7daf891aed583c228eaf88c 100644 (file)
--- a/ip6tables-standalone.c
+++ b/ip6tables-standalone.c
@@ -56,7 +56,8 @@ main(int argc, char *argv[])
        if (lib_dir == NULL) {
                lib_dir = getenv("IP6TABLES_LIB_DIR");
                if (lib_dir != NULL)
-                       fprintf(stderr, "IP6TABLES_LIB_DIR is deprecated\n");
+                       fprintf(stderr, "IP6TABLES_LIB_DIR is deprecated, "
+                               "use XTABLES_LIBDIR.\n");
        }
        if (lib_dir == NULL)
                lib_dir = XTABLES_LIBDIR;

diff --git a/iptables-restore.c b/iptables-restore.c
index 4ea9306b70830d3856eed0a323408c1ceae926aa..7cc6d6dcb8fbdba4f613bbd63a2e356b7e3c1523 100644 (file)
--- a/iptables-restore.c
+++ b/iptables-restore.c
@@ -135,7 +135,8 @@ main(int argc, char *argv[])
        if (lib_dir == NULL) {
                lib_dir = getenv("IPTABLES_LIB_DIR");
                if (lib_dir != NULL)
-                       fprintf(stderr, "IPTABLES_LIB_DIR is deprecated\n");
+                       fprintf(stderr, "IPTABLES_LIB_DIR is deprecated, "
+                               "use XTABLES_LIBDIR.\n");
        }
        if (lib_dir == NULL)
                lib_dir = XTABLES_LIBDIR;

diff --git a/iptables-save.c b/iptables-save.c
index 6252c0b0598f3b9c64a1100676a950ede11e4549..7118d1f2852aa79574573d396d4d300c707af9f5 100644 (file)
--- a/iptables-save.c
+++ b/iptables-save.c
@@ -143,7 +143,8 @@ main(int argc, char *argv[])
        if (lib_dir == NULL) {
                lib_dir = getenv("IPTABLES_LIB_DIR");
                if (lib_dir != NULL)
-                       fprintf(stderr, "IPTABLES_LIB_DIR is deprecated\n");
+                       fprintf(stderr, "IPTABLES_LIB_DIR is deprecated, "
+                               "use XTABLES_LIBDIR.\n");
        }
        if (lib_dir == NULL)
                lib_dir = XTABLES_LIBDIR;

diff --git a/iptables-standalone.c b/iptables-standalone.c
index dbfae5bec68326cc958e61950e306b75dafbec17..3f2432fe4a1eecdaa590a27340581b07f6393a33 100644 (file)
--- a/iptables-standalone.c
+++ b/iptables-standalone.c
@@ -57,7 +57,8 @@ main(int argc, char *argv[])
        if (lib_dir == NULL) {
                lib_dir = getenv("IPTABLES_LIB_DIR");
                if (lib_dir != NULL)
-                       fprintf(stderr, "IPTABLES_LIB_DIR is deprecated\n");
+                       fprintf(stderr, "IPTABLES_LIB_DIR is deprecated, "
+                               "use XTABLES_LIBDIR.\n");
        }
        if (lib_dir == NULL)
                lib_dir = XTABLES_LIBDIR;