FYI, forgot to CC you.
2011/6/6 Maciej Åenczykowski <zenczykowski@xxxxxxxxx>:
> From: Maciej Åenczykowski <maze@xxxxxxxxxx>
>
> Commit de791ff2d7ac85fa0a707bbd6d98457bb18c5cbb didn't actually
> build the iptables-xml code into the xtables-multi binary...
>
> Change-Id: Ib2701ae27ef10c2ce23b13b97b2abb52b520cd95
> Signed-off-by: Maciej Zenczykowski <maze@xxxxxxxxxx>
> ---
> ÂMakefile.am   Â|  Â4 ++--
> Âiptables-multi.h | Â Â1 -
> Âiptables-xml.c  |  Â4 ++--
> Âxtables-multi.c Â| Â Â6 ++++--
> Âxtables-multi.h Â| Â Â6 ++++++
> Â5 files changed, 14 insertions(+), 7 deletions(-)
> Âcreate mode 100644 xtables-multi.h
>
> diff --git a/Makefile.am b/Makefile.am
> index 60ea83b..48f01d8 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 a9912b0..a2bb878 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 aa98f75..5aa638c 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@xxxxxxxxxxxxxxx>
> - * based on iptables-restor (C) 2000-2002 by Harald Welte <laforge@xxxxxxxxxxxx>
> + * based on iptables-restore (C) 2000-2002 by Harald Welte <laforge@xxxxxxxxxxxx>
> Â* based on previous code from Rusty Russell <rusty@xxxxxxxxxxxxxxxx>
> Â*
> Â* 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 f8d56ce..8014d5f 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 0000000..615724b
> --- /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 */
> --
> 1.7.3.1
>
>
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
