diff options
author | Patrick McHardy <kaber@trash.net> | 2009-02-12 07:09:55 +0100 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2009-02-12 07:09:55 +0100 |
commit | 6f3c30059d9cf73c438db08998c58cd1b502eb44 (patch) | |
tree | d81ab345883d439f4519031728f59e79b0178d59 /xtables.c | |
parent | 8b7baebc93989106fd5d26b262d0ce191f8ef7c0 (diff) | |
parent | 47a6fd9ec9891a8040eb8fd6db3c5012c1056061 (diff) |
Merge branch 'master' of git://dev.medozas.de/iptables
Diffstat (limited to 'xtables.c')
-rw-r--r-- | xtables.c | 22 |
1 files changed, 22 insertions, 0 deletions
@@ -39,6 +39,15 @@ #ifndef NO_SHARED_LIBS #include <dlfcn.h> #endif +#ifndef IPT_SO_GET_REVISION_MATCH /* Old kernel source. */ +# define IPT_SO_GET_REVISION_MATCH (IPT_BASE_CTL + 2) +# define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3) +#endif +#ifndef IP6T_SO_GET_REVISION_MATCH /* Old kernel source. */ +# define IP6T_SO_GET_REVISION_MATCH 68 +# define IP6T_SO_GET_REVISION_TARGET 69 +#endif + #define NPROTO 255 @@ -163,6 +172,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; } |