diff options
| author | Maciej Żenczykowski <zenczykowski@gmail.com> | 2011-06-06 18:27:09 -0700 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2011-06-07 11:29:01 +0200 |
| commit | 4598ed7d3e22d74ffaad7948ddc3455ac9aa7576 (patch) | |
| tree | 8f23adfa0cb248615ac49c8e6e49a68791303050 | |
| parent | a1cd1f2a4a35427c68cd0d1bd2761d5be42b12b1 (diff) | |
xtables-multi: fix absence of xml translator in IPv6-only builds
Commit v1.4.11-4-gde791ff did not actually build the iptables-xml code
into the xtables-multi binary.
Signed-off-by: Maciej Zenczykowski <maze@google.com>
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | iptables-multi.h | 1 | ||||
| -rw-r--r-- | iptables-xml.c | 4 | ||||
| -rw-r--r-- | xtables-multi.c | 6 | ||||
| -rw-r--r-- | xtables-multi.h | 6 |
5 files changed, 14 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 60ea83b1..48f01d81 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,7 @@ libxtables_la_CFLAGS = ${AM_CFLAGS} -DNO_SHARED_LIBS=1 libxtables_la_LIBADD = endif -xtables_multi_SOURCES = xtables-multi.c +xtables_multi_SOURCES = xtables-multi.c iptables-xml.c xtables_multi_CFLAGS = ${AM_CFLAGS} -DIPTABLES_MULTI xtables_multi_LDFLAGS = -rdynamic xtables_multi_LDADD = extensions/libext.a @@ -46,7 +46,7 @@ if ENABLE_STATIC xtables_multi_CFLAGS += -DALL_INCLUSIVE endif if ENABLE_IPV4 -xtables_multi_SOURCES += iptables-save.c iptables-restore.c iptables-xml.c \ +xtables_multi_SOURCES += iptables-save.c iptables-restore.c \ iptables-standalone.c iptables.c xtables_multi_CFLAGS += -DENABLE_IPV4 xtables_multi_LDADD += libiptc/libip4tc.la extensions/libext4.a diff --git a/iptables-multi.h b/iptables-multi.h index a9912b04..a2bb8784 100644 --- a/iptables-multi.h +++ b/iptables-multi.h @@ -4,6 +4,5 @@ extern int iptables_main(int, char **); extern int iptables_save_main(int, char **); extern int iptables_restore_main(int, char **); -extern int iptables_xml_main(int, char **); #endif /* _IPTABLES_MULTI_H */ diff --git a/iptables-xml.c b/iptables-xml.c index aa98f75e..5aa638c0 100644 --- a/iptables-xml.c +++ b/iptables-xml.c @@ -1,6 +1,6 @@ /* Code to convert iptables-save format to xml format, * (C) 2006 Ufo Mechanic <azez@ufomechanic.net> - * based on iptables-restor (C) 2000-2002 by Harald Welte <laforge@gnumonks.org> + * based on iptables-restore (C) 2000-2002 by Harald Welte <laforge@gnumonks.org> * based on previous code from Rusty Russell <rusty@linuxcare.com.au> * * This code is distributed under the terms of GNU GPL v2 @@ -14,7 +14,7 @@ #include <stdarg.h> #include "iptables.h" #include "libiptc/libiptc.h" -#include "iptables-multi.h" +#include "xtables-multi.h" #include <xtables.h> #ifdef DEBUG diff --git a/xtables-multi.c b/xtables-multi.c index f8d56ce9..8014d5fb 100644 --- a/xtables-multi.c +++ b/xtables-multi.c @@ -3,6 +3,8 @@ #include <string.h> #include "xshared.h" +#include "xtables-multi.h" + #ifdef ENABLE_IPV4 #include "iptables-multi.h" #endif @@ -19,9 +21,9 @@ static const struct subcommand multi_subcommands[] = { {"save4", iptables_save_main}, {"iptables-restore", iptables_restore_main}, {"restore4", iptables_restore_main}, - {"iptables-xml", iptables_xml_main}, - {"xml4", iptables_xml_main}, #endif + {"iptables-xml", iptables_xml_main}, + {"xml", iptables_xml_main}, #ifdef ENABLE_IPV6 {"ip6tables", ip6tables_main}, {"main6", ip6tables_main}, diff --git a/xtables-multi.h b/xtables-multi.h new file mode 100644 index 00000000..615724b1 --- /dev/null +++ b/xtables-multi.h @@ -0,0 +1,6 @@ +#ifndef _XTABLES_MULTI_H +#define _XTABLES_MULTI_H 1 + +extern int iptables_xml_main(int, char **); + +#endif /* _XTABLES_MULTI_H */ |