diff options
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | extensions/libxt_hashlimit.c | 2 | ||||
| -rw-r--r-- | ip6tables-save.8 | 9 | ||||
| -rw-r--r-- | iptables-save.8 | 9 | ||||
| -rw-r--r-- | release.sh | 2 | ||||
| -rw-r--r-- | xtables.c | 2 |
7 files changed, 16 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index b8859acc..c0181d49 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,7 @@ libxtables_la_LIBADD = -ldl # iptables, dynamic iptables_SOURCES = iptables-standalone.c iptables.c iptables_LDFLAGS = -rdynamic -iptables_LDADD = -lm libiptc/libiptc.la extensions/libext4.a libxtables.la +iptables_LDADD = libiptc/libiptc.la extensions/libext4.a libxtables.la -lm iptables_xml_LDADD = libxtables.la iptables_multi_SOURCES = iptables-multi.c iptables-save.c \ @@ -47,14 +47,14 @@ iptables_save_LDADD = ${iptables_LDADD} # iptables-multi, semi-static iptables_static_SOURCES = ${iptables_multi_SOURCES} xtables.c iptables_static_CFLAGS = ${iptables_multi_CFLAGS} -DNO_SHARED_LIBS=1 -iptables_static_LDADD = -lm libiptc/libiptc.la extensions/libext4.a +iptables_static_LDADD = libiptc/libiptc.la extensions/libext4.a -lm iptables_xml_SOURCES = iptables-xml.c # ip6tables, dynamic ip6tables_SOURCES = ip6tables-standalone.c ip6tables.c ip6tables_LDFLAGS = -rdynamic -ip6tables_LDADD = -lm libiptc/libiptc.la extensions/libext6.a libxtables.la +ip6tables_LDADD = libiptc/libiptc.la extensions/libext6.a libxtables.la -lm ip6tables_multi_SOURCES = ip6tables-multi.c ip6tables-save.c \ ip6tables-restore.c ip6tables-standalone.c \ @@ -74,7 +74,7 @@ ip6tables_save_LDADD = ${ip6tables_LDADD} # iptables-multi, semi-static ip6tables_static_SOURCES = ${ip6tables_multi_SOURCES} xtables.c ip6tables_static_CFLAGS = ${ip6tables_multi_CFLAGS} -DNO_SHARED_LIBS=1 -ip6tables_static_LDADD = -lm libiptc/libiptc.la extensions/libext6.a +ip6tables_static_LDADD = libiptc/libiptc.la extensions/libext6.a -lm bin_PROGRAMS = iptables-xml sbin_PROGRAMS = diff --git a/configure.ac b/configure.ac index 2680d92a..87f693f8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -AC_INIT([iptables], [1.4.3]) +AC_INIT([iptables], [1.4.3.1]) # See libtool.info "Libtool's versioning system" libxtables_vcurrent=1 diff --git a/extensions/libxt_hashlimit.c b/extensions/libxt_hashlimit.c index 5377b6d8..9a7e5ded 100644 --- a/extensions/libxt_hashlimit.c +++ b/extensions/libxt_hashlimit.c @@ -636,7 +636,7 @@ hashlimit_mt_save(const struct xt_hashlimit_mtinfo1 *info, unsigned int dmask) if (info->cfg.max != 0) printf("--hashlimit-htable-max %u ", info->cfg.max); if (info->cfg.gc_interval != XT_HASHLIMIT_GCINTERVAL) - printf("--hashlimit-htable-gcinterval %u", info->cfg.gc_interval); + printf("--hashlimit-htable-gcinterval %u ", info->cfg.gc_interval); if (info->cfg.expire != XT_HASHLIMIT_EXPIRE) printf("--hashlimit-htable-expire %u ", info->cfg.expire); diff --git a/ip6tables-save.8 b/ip6tables-save.8 index 47eb44ad..c760b32a 100644 --- a/ip6tables-save.8 +++ b/ip6tables-save.8 @@ -19,10 +19,10 @@ .\" .\" .SH NAME -ip6tables-save \- Save IPv6 Tables +ip6tables-save - dump iptables rules to stdout .SH SYNOPSIS -.BR "ip6tables-save " "[-M modprobe] [-c] [-t table]" -.br +\fBip6tables\-save\fP [\fB\-M\fP \fImodprobe\fP] [\fB\-c\fP] +[\fB\-t\fP \fItable\fP .SH DESCRIPTION .PP .B ip6tables-save @@ -36,8 +36,7 @@ inspect /proc/sys/kernel/modprobe to determine the executable's path. \fB\-c\fR, \fB\-\-counters\fR include the current values of all packet and byte counters in the output .TP -\fB\-t\fR, \fB\-\-table\fR \fBtablename\fR -.TP +\fB\-t\fR, \fB\-\-table\fR \fItablename\fP restrict output to only one table. If not specified, output includes all available tables. .SH BUGS diff --git a/iptables-save.8 b/iptables-save.8 index de5fd48b..c1729fed 100644 --- a/iptables-save.8 +++ b/iptables-save.8 @@ -19,10 +19,10 @@ .\" .\" .SH NAME -iptables-save \- Save IP Tables +iptables-save - dump iptables rules to stdout .SH SYNOPSIS -.BR "iptables-save " "[-M modprobe] [-c] [-t table]" -.br +\fBiptables\-save\fP [\fB\-M\fP \fImodprobe\fP] [\fB\-c\fP] +[\fB\-t\fP \fItable\fP] .SH DESCRIPTION .PP .B iptables-save @@ -36,8 +36,7 @@ inspect /proc/sys/kernel/modprobe to determine the executable's path. \fB\-c\fR, \fB\-\-counters\fR include the current values of all packet and byte counters in the output .TP -\fB\-t\fR, \fB\-\-table\fR \fBtablename\fR -.TP +\fB\-t\fR, \fB\-\-table\fR \fItablename\fP restrict output to only one table. If not specified, output includes all available tables. .SH BUGS @@ -2,7 +2,7 @@ # set -e -VERSION=1.4.3 +VERSION=1.4.3-rc1 PREV_VERSION=1.4.2 TMPDIR=/tmp/ipt-release IPTDIR="$TMPDIR/iptables-$VERSION" @@ -638,7 +638,7 @@ xtables_find_target(const char *name, enum xtables_tryload tryload) else ptr = NULL; } - if(!ptr && (tryload == LOAD_MUST_SUCCEED)) { + if (ptr == NULL && tryload == XTF_LOAD_MUST_SUCCEED) { xt_params->exit_err(PARAMETER_PROBLEM, "Couldn't find target `%s'\n", name); } |