From: Florian Westphal <fwestphal@astaro.com>
Date: Wed, 17 Nov 2010 14:54:18 +0000 (+0100)
Subject: libxt_conntrack: fix --ctdir save/dump output format
X-Git-Tag: v1.4.11~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f09f1b39ced2ae7109382dcf066785bab4a966a;p=thirdparty%2Fiptables.git

libxt_conntrack: fix --ctdir save/dump output format

$ iptables-save | iptables-restore
iptables-restore v1.4.6: conntrack: Bad value for "--ctdir" option: "ORIGINAL-j"

Signed-off-by: Florian Westphal <fwestphal@astaro.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---

diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c
index 6c4a9cd1..dd3fb6fc 100644
--- a/extensions/libxt_conntrack.c
+++ b/extensions/libxt_conntrack.c
@@ -974,9 +974,9 @@ matchinfo_print(const void *ip, const struct xt_entry_match *match, int numeric,
 
 	if (sinfo->flags & XT_CONNTRACK_DIRECTION) {
 		if (sinfo->invflags & XT_CONNTRACK_DIRECTION)
-			printf("%sctdir REPLY", optpfx);
+			printf("%sctdir REPLY ", optpfx);
 		else
-			printf("%sctdir ORIGINAL", optpfx);
+			printf("%sctdir ORIGINAL ", optpfx);
 	}
 
 }
@@ -1079,9 +1079,9 @@ conntrack_dump(const struct xt_conntrack_mtinfo2 *info, const char *prefix,
 
 	if (info->match_flags & XT_CONNTRACK_DIRECTION) {
 		if (info->invert_flags & XT_CONNTRACK_DIRECTION)
-			printf("%sctdir REPLY", prefix);
+			printf("%sctdir REPLY ", prefix);
 		else
-			printf("%sctdir ORIGINAL", prefix);
+			printf("%sctdir ORIGINAL ", prefix);
 	}
 }