summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kaber/emailAddress=kaber@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kaber/emailAddress=kaber@netfilter.org>2006-07-05 09:31:45 +0000
committer/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kaber/emailAddress=kaber@netfilter.org </C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kaber/emailAddress=kaber@netfilter.org>2006-07-05 09:31:45 +0000
commite10c435b377a05f2963be57505041124337c18d3 (patch)
treee355eaf6653e9d8f260496e1f1d8e408680a44ce
parent3307d25092efc4327ef7f5a6b5336b5cf69d9d2a (diff)
[PATCH] libiptc symbols clash (Phil Oester <kernel@linuxace.com>)
As reported by Dmitry Levin, the TC_NUM_RULES and TC_GET_RULE exports clash. His patch below, resolving bug #456
-rw-r--r--libiptc/libip4tc.c2
-rw-r--r--libiptc/libip6tc.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/libiptc/libip4tc.c b/libiptc/libip4tc.c
index 2e8647c..a0cdc2f 100644
--- a/libiptc/libip4tc.c
+++ b/libiptc/libip4tc.c
@@ -94,6 +94,8 @@ typedef unsigned int socklen_t;
#define TC_FREE iptc_free
#define TC_COMMIT iptc_commit
#define TC_STRERROR iptc_strerror
+#define TC_NUM_RULES iptc_num_rules
+#define TC_GET_RULE iptc_get_rule
#define TC_AF AF_INET
#define TC_IPPROTO IPPROTO_IP
diff --git a/libiptc/libip6tc.c b/libiptc/libip6tc.c
index 8ca5ea6..5b3ae0b 100644
--- a/libiptc/libip6tc.c
+++ b/libiptc/libip6tc.c
@@ -89,6 +89,8 @@ typedef unsigned int socklen_t;
#define TC_FREE ip6tc_free
#define TC_COMMIT ip6tc_commit
#define TC_STRERROR ip6tc_strerror
+#define TC_NUM_RULES ip6tc_num_rules
+#define TC_GET_RULE ip6tc_get_rule
#define TC_AF AF_INET6
#define TC_IPPROTO IPPROTO_IPV6