[PATCH 1/2 nft] parser_bison: fix typo in symbol redefinition error reporting

[PATCH 1/2 nft] parser_bison: fix typo in symbol redefinition error reporting

[Pablo Neira Ayuso]

"redefinition" instead of "redfinition".

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/parser_bison.y | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/parser_bison.y b/src/parser_bison.y
index d946e0e..6a029d1 100644
--- a/src/parser_bison.y
+++ b/src/parser_bison.y
@@ -635,7 +635,7 @@ common_block		:	INCLUDE		QUOTED_STRING	stmt_seperator
 				struct scope *scope = current_scope(state);
 
 				if (symbol_lookup(scope, $2) != NULL) {
-					erec_queue(error(&@2, "redfinition of symbol '%s'", $2),
+					erec_queue(error(&@2, "redefinition of symbol '%s'", $2),
 						   state->msgs);
 					YYERROR;
 				}
-- 
2.1.4

[PATCH 2/2 nft] tests: shell: make sure split table definition works via nft -f

[Pablo Neira Ayuso]

Add test to cover split table definition in one single file.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 tests/shell/testcases/nft-f/0008split_tables_0 | 50 ++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100755 tests/shell/testcases/nft-f/0008split_tables_0

diff --git a/tests/shell/testcases/nft-f/0008split_tables_0 b/tests/shell/testcases/nft-f/0008split_tables_0
new file mode 100755
index 0000000..2bc6e46
--- /dev/null
+++ b/tests/shell/testcases/nft-f/0008split_tables_0
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -e
+
+tmpfile=$(mktemp)
+if [ ! -w $tmpfile ] ; then
+        echo "Failed to create tmp file" >&2
+        exit 0
+fi
+
+trap "rm -rf $tmpfile" EXIT # cleanup if aborted
+
+RULESET="table inet filter {
+	chain ssh {
+		type filter hook input priority 0; policy accept;
+		tcp dport ssh accept;
+	}
+}
+
+table inet filter {
+	chain input {
+		type filter hook input priority 1; policy drop;
+	}
+}"
+
+echo "$RULESET" > $tmpfile
+$NFT -f $tmpfile
+if [ $? -ne 0 ] ; then
+        echo "E: unable to load good ruleset" >&2
+        exit 1
+fi
+
+EXPECTED="table inet filter {
+	chain ssh {
+		type filter hook input priority 0; policy accept;
+		tcp dport ssh accept
+	}
+
+	chain input {
+		type filter hook input priority 1; policy drop;
+	}
+}"
+
+GET="$($NFT list ruleset)"
+
+if [ "$EXPECTED" != "$GET" ] ; then
+	DIFF="$(which diff)"
+	[ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET")
+	exit 1
+fi
-- 
2.1.4