[iptables] Merge branch 'master' of git://dev.medozas.de/iptables
Patrick McHardy
netfilter-cvslog-bounces at lists.netfilter.org
Thu Feb 12 07:10:19 CET 2009
Gitweb: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=6f3c30059d9cf73c438db08998c58cd1b502eb44
commit 6f3c30059d9cf73c438db08998c58cd1b502eb44
Merge: 8b7baeb... 47a6fd9...
Author: Patrick McHardy <kaber at trash.net>
AuthorDate: Thu Feb 12 07:09:55 2009 +0100
Commit: Patrick McHardy <kaber at trash.net>
CommitDate: Thu Feb 12 07:09:55 2009 +0100
Merge branch 'master' of git://dev.medozas.de/iptables
commit 47a6fd9ec9891a8040eb8fd6db3c5012c1056061
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Feb 10 10:51:25 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Feb 10 10:52:17 2009 +0100
src: consolidate duplicate code in iptables/internal.h
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit c31870f9bebb3d4d082016fcfaf8c2177ae32eb2
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Feb 10 10:48:28 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Feb 10 10:52:17 2009 +0100
libxtables: move compat defines to xtables.c
Addendum to commit v1.4.3-rc1-41-g77f48c2 where the macro users
got moved.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit ea955480a8ae43aa956ac62e1aab3f9670529819
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Feb 10 10:43:42 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Feb 10 10:52:17 2009 +0100
src: remove unused ipt_tryload macro
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 395e441e20ea9ab7f37122bcfd76fec527fa447b
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Feb 10 10:43:08 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Feb 10 10:52:17 2009 +0100
src: remove iptables_rule_match indirection macro
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit c02e80878979d2205f3d89d05548397871e598e9
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Feb 10 10:40:15 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Feb 10 10:52:06 2009 +0100
libxtables: decouple non-xtables parts from header
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit b6601f3a4f65d0956dd829b63c503875b10d5c74
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Feb 10 10:25:08 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Feb 10 10:25:08 2009 +0100
libxtables: remove unused XT_LIB_DIR macro
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 5c3e0767764bb7fa1db61ac326e8359161380e21
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Feb 10 10:20:19 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Feb 10 10:20:55 2009 +0100
build: move -ldl to proper LDADD
libxtables uses dlopen, so *it* has to use -ldl, not the main program.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit ec934198bd6ee2f21171dba440ca96334b0d874b
Author: Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Tue Feb 10 09:54:04 2009 +0100
Commit: Jan Engelhardt <jengelh at medozas.de>
CommitDate: Tue Feb 10 10:03:15 2009 +0100
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 at medozas.de>
via 6f3c30059d9cf73c438db08998c58cd1b502eb44 (commit)
via 47a6fd9ec9891a8040eb8fd6db3c5012c1056061 (commit)
via c31870f9bebb3d4d082016fcfaf8c2177ae32eb2 (commit)
via ea955480a8ae43aa956ac62e1aab3f9670529819 (commit)
via 395e441e20ea9ab7f37122bcfd76fec527fa447b (commit)
via c02e80878979d2205f3d89d05548397871e598e9 (commit)
via b6601f3a4f65d0956dd829b63c503875b10d5c74 (commit)
via 5c3e0767764bb7fa1db61ac326e8359161380e21 (commit)
via ec934198bd6ee2f21171dba440ca96334b0d874b (commit)
from 8b7baebc93989106fd5d26b262d0ce191f8ef7c0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6f3c30059d9cf73c438db08998c58cd1b502eb44
Merge: 8b7baebc93989106fd5d26b262d0ce191f8ef7c0 47a6fd9ec9891a8040eb8fd6db3c5012c1056061
Author: Patrick McHardy <kaber at trash.net>
Date: Thu Feb 12 07:09:55 2009 +0100
Merge branch 'master' of git://dev.medozas.de/iptables
commit 47a6fd9ec9891a8040eb8fd6db3c5012c1056061
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Feb 10 10:51:25 2009 +0100
src: consolidate duplicate code in iptables/internal.h
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit c31870f9bebb3d4d082016fcfaf8c2177ae32eb2
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Feb 10 10:48:28 2009 +0100
libxtables: move compat defines to xtables.c
Addendum to commit v1.4.3-rc1-41-g77f48c2 where the macro users
got moved.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit ea955480a8ae43aa956ac62e1aab3f9670529819
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Feb 10 10:43:42 2009 +0100
src: remove unused ipt_tryload macro
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 395e441e20ea9ab7f37122bcfd76fec527fa447b
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Feb 10 10:43:08 2009 +0100
src: remove iptables_rule_match indirection macro
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit c02e80878979d2205f3d89d05548397871e598e9
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Feb 10 10:40:15 2009 +0100
libxtables: decouple non-xtables parts from header
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit b6601f3a4f65d0956dd829b63c503875b10d5c74
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Feb 10 10:25:08 2009 +0100
libxtables: remove unused XT_LIB_DIR macro
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit 5c3e0767764bb7fa1db61ac326e8359161380e21
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Feb 10 10:20:19 2009 +0100
build: move -ldl to proper LDADD
libxtables uses dlopen, so *it* has to use -ldl, not the main program.
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
commit ec934198bd6ee2f21171dba440ca96334b0d874b
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Tue Feb 10 09:54:04 2009 +0100
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 at medozas.de>
-----------------------------------------------------------------------
.gitignore | 2 +-
Makefile.am | 7 ++++---
configure.ac | 2 +-
include/ip6tables.h | 11 +----------
include/iptables.h | 11 +----------
include/iptables/internal.h.in | 13 +++++++++++++
include/xtables.h.in | 7 ++++++-
include/xtables/internal.h.in | 17 -----------------
ip6tables.c | 24 ++++++++++++------------
iptables.c | 24 ++++++++++++------------
xtables.c | 22 ++++++++++++++++++++++
11 files changed, 73 insertions(+), 67 deletions(-)
create mode 100644 include/iptables/internal.h.in
delete mode 100644 include/xtables/internal.h.in
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 at medozas.de>
diff --git a/xtables.c b/xtables.c
index 6c95475..c898889 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;
}
More information about the netfilter-cvslog
mailing list