diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2008-02-11 01:02:00 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2008-04-13 07:25:24 +0200 |
| commit | 21b41eea4724c57d2b6e5998cf38255046e43ad3 (patch) | |
| tree | d1f78d7c2e77323c951b6675a5c1bb8a0c71f5c3 /ip6tables-save.c | |
| parent | 9a8c77fc8df3155747c34dcea79b7834a2a9a40a (diff) | |
Combine IP{,6}T_LIB_DIR into XTABLES_LIBDIR
Diffstat (limited to 'ip6tables-save.c')
| -rw-r--r-- | ip6tables-save.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ip6tables-save.c b/ip6tables-save.c index e7eade17..e4408872 100644 --- a/ip6tables-save.c +++ b/ip6tables-save.c @@ -332,9 +332,14 @@ int main(int argc, char *argv[]) program_name = "ip6tables-save"; program_version = IPTABLES_VERSION; - lib_dir = getenv("IP6TABLES_LIB_DIR"); - if (!lib_dir) - lib_dir = IP6T_LIB_DIR; + lib_dir = getenv("XTABLES_LIBDIR"); + if (lib_dir == NULL) { + lib_dir = getenv("IP6TABLES_LIB_DIR"); + if (lib_dir != NULL) + fprintf(stderr, "IP6TABLES_LIB_DIR is deprecated\n"); + } + if (lib_dir == NULL) + lib_dir = XTABLES_LIBDIR; #ifdef NO_SHARED_LIBS init_extensions(); |