From 27791d35cf3fd7e7ca1389804b6e1820fa70bc0f Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Tue, 11 Nov 2014 10:20:22 -0300
Subject: [PATCH] arptables: remove dead dynamic hooks code
The code is unused and #if'ed away, it also breaks pure-static
builds because of the dlfcn.h include.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
(cherry picked from commit 4b7d6b0cac33d41cb3c74694ada06e19aa7e920e)
Signed-off-by: Phil Sutter <psutter@redhat.com>
---
arptables.c | 1 -
libarptc/libarptc_incl.c | 15 ---------------
2 files changed, 16 deletions(-)
diff --git a/arptables.c b/arptables.c
index 64ac3aa226a2c..845e226a98a30 100644
--- a/arptables.c
+++ b/arptables.c
@@ -35,7 +35,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <inttypes.h>
-#include <dlfcn.h>
#include <ctype.h>
#include <stdarg.h>
#include <limits.h>
diff --git a/libarptc/libarptc_incl.c b/libarptc/libarptc_incl.c
index 9c1aeac7ca3de..1d2e8b7b7ac01 100644
--- a/libarptc/libarptc_incl.c
+++ b/libarptc/libarptc_incl.c
@@ -257,22 +257,7 @@ TC_INIT(const char *tablename)
== NULL)
return NULL;
-/* Too hard --RR */
-#if 0
- sprintf(pathname, "%s/%s", ARPT_LIB_DIR, info.name);
- dynlib = dlopen(pathname, RTLD_NOW);
- if (!dynlib) {
- errno = ENOENT;
- return NULL;
- }
- h->hooknames = dlsym(dynlib, "hooknames");
- if (!h->hooknames) {
- errno = ENOENT;
- return NULL;
- }
-#else
h->hooknames = hooknames;
-#endif
/* Initialize current state */
h->info = info;
--
2.21.0