summaryrefslogtreecommitdiffstats
path: root/xtables-multi.c
diff options
context:
space:
mode:
authorMaciej ┼╗enczykowski <zenczykowski@gmail.com>2011-06-06 18:27:09 -0700
committerJan Engelhardt <jengelh@medozas.de>2011-06-07 11:29:01 +0200
commit4598ed7d3e22d74ffaad7948ddc3455ac9aa7576 (patch)
tree8f23adfa0cb248615ac49c8e6e49a68791303050 /xtables-multi.c
parenta1cd1f2a4a35427c68cd0d1bd2761d5be42b12b1 (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>
Diffstat (limited to 'xtables-multi.c')
-rw-r--r--xtables-multi.c6
1 files changed, 4 insertions, 2 deletions
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},