diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-02-09 18:58:45 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-02-09 18:58:45 +0100 |
| commit | 300e2909ba4714abc6093cba0ed860708282bd3e (patch) | |
| tree | 545c79c9fcbe036db503e50a3643acb3d5ff088d /iptables-restore.c | |
| parent | 9cfc59f71f83ee97c4513fd340acf1e45073562b (diff) | |
| parent | 1eb619f3a0508d62847c311e69a09f4a8534c4df (diff) | |
Merge branch 'master' of git://dev.medozas.de/iptables
Diffstat (limited to 'iptables-restore.c')
| -rw-r--r-- | iptables-restore.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/iptables-restore.c b/iptables-restore.c index 3fbc9087..810806f0 100644 --- a/iptables-restore.c +++ b/iptables-restore.c @@ -129,19 +129,12 @@ main(int argc, char *argv[]) const char *tablename = NULL; program_name = "iptables-restore"; - program_version = XTABLES_VERSION; + program_version = IPTABLES_VERSION; line = 0; - 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, " - "use XTABLES_LIBDIR.\n"); - } - if (lib_dir == NULL) - lib_dir = XTABLES_LIBDIR; - + xtables_program_name = program_name; + xtables_init(); + xtables_set_nfproto(NFPROTO_IPV4); #ifdef NO_SHARED_LIBS init_extensions(); #endif @@ -162,7 +155,7 @@ main(int argc, char *argv[]) break; case 'h': print_usage("iptables-restore", - XTABLES_VERSION); + IPTABLES_VERSION); break; case 'n': noflush = 1; |