fix compile/install error for iptables-xml with DO_MULTI=1 (Lutz Jaenicke)

diff --git a/Makefile b/Makefile
index b651063b34f052e7f622859177b96b2d990b33e0..c3e2700782d63bfa26825e5cab2b78b403046a68 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -170,7 +170,7 @@ iptables-xml: iptables-xml.c #iptables.o # $(STATIC_LIBS) libiptc/libiptc.a
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 ifeq ($(DO_MULTI), 1)
-$(DESTDIR)$(BINDIR)/iptables-xml: iptables-xml
+$(DESTDIR)$(BINDIR)/iptables-xml: iptables
        @[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR)
        ln -sf $< $@
 else

diff --git a/ip6tables-restore.c b/ip6tables-restore.c
index f7eac6802016bcc9d6e93682dc6675ab4ed35af8..a0c359a1e7278f537f1f9fc23bff029d4fa2558f 100644 (file)
--- a/ip6tables-restore.c
+++ b/ip6tables-restore.c
@@ -74,7 +74,7 @@ ip6tc_handle_t create_handle(const char *tablename, const char* modprobe)
        return handle;
 }
 
-int parse_counters(char *string, struct ip6t_counters *ctr)
+static int parse_counters(char *string, struct ip6t_counters *ctr)
 {
        return (sscanf(string, "[%llu:%llu]", (unsigned long long *)&ctr->pcnt, (unsigned long long *)&ctr->bcnt) == 2);
 }

diff --git a/iptables-multi.c b/iptables-multi.c
index 0563099546a0cf33987efa456e3adb2ba822a2b1..7ade3335ec137e7fcbdbb6989db10350978ed367 100644 (file)
--- a/iptables-multi.c
+++ b/iptables-multi.c
@@ -6,6 +6,7 @@
 int iptables_main(int argc, char **argv);
 int iptables_save_main(int argc, char **argv);
 int iptables_restore_main(int argc, char **argv);
+int iptables_xml_main(int argc, char **argv);
 
 int main(int argc, char **argv) {
   char *progname;
@@ -25,6 +26,9 @@ int main(int argc, char **argv) {
     if (!strcmp(progname, "iptables-restore"))
       return iptables_restore_main(argc, argv);
     
+    if (!strcmp(progname, "iptables-xml"))
+      return iptables_xml_main(argc, argv);
+    
     fprintf(stderr, "iptables multi-purpose version: unknown applet name %s\n", progname);
     exit(1);
   }

diff --git a/iptables-restore.c b/iptables-restore.c
index cc49c738b2ced53f4cf273ada89f1799dc005e62..628997ec84467dc3f363c3e34e93b489b0f4dd78 100644 (file)
--- a/iptables-restore.c
+++ b/iptables-restore.c
@@ -71,7 +71,7 @@ iptc_handle_t create_handle(const char *tablename, const char* modprobe )
        return handle;
 }
 
-int parse_counters(char *string, struct ipt_counters *ctr)
+static int parse_counters(char *string, struct ipt_counters *ctr)
 {
        return (sscanf(string, "[%llu:%llu]", (unsigned long long *)&ctr->pcnt, (unsigned long long *)&ctr->bcnt) == 2);
 }

diff --git a/iptables-xml.c b/iptables-xml.c
index 34437e0745917ea5569423857d3b03f7754d0053..ce3049c29a2cdb880b51cbd67c928bf2c00cc081 100644 (file)
--- a/iptables-xml.c
+++ b/iptables-xml.c
@@ -26,10 +26,10 @@
 /* no need to link with iptables.o */
 const char *program_name;
 const char *program_version;
-int line = 0;
 
-void
-exit_error(enum exittype status, char *msg, ...)
+#ifndef IPTABLES_MULTI
+int line = 0;
+void exit_error(enum exittype status, char *msg, ...)
 {
        va_list args;
 
@@ -41,6 +41,7 @@ exit_error(enum exittype status, char *msg, ...)
        /* On error paths, make sure that we don't leak memory */
        exit(status);
 }
+#endif
 
 static void print_usage(const char *name, const char *version)
            __attribute__ ((noreturn));
@@ -66,7 +67,7 @@ print_usage(const char *name, const char *version)
        exit(1);
 }
 
-int
+static int
 parse_counters(char *string, struct ipt_counters *ctr)
 {
        if (string != NULL)
@@ -605,7 +606,7 @@ do_rule(char *pcnt, char *bcnt, int argc, char *argv[], int argvattr[])
 
 #ifdef IPTABLES_MULTI
 int
-iptables_restore_main(int argc, char *argv[])
+iptables_xml_main(int argc, char *argv[])
 #else
 int
 main(int argc, char *argv[])