xtables-restore: output the same error message that iptables-restore uses
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
diff --git a/iptables/nft.c b/iptables/nft.c
index ca56d0e..7dad246 100644
--- a/iptables/nft.c
+++ b/iptables/nft.c
@@ -2641,7 +2641,7 @@
if (errno != EEXIST)
perror("mnl-talk:nft_commit");
}
- return ret;
+ return ret == 0 ? 1 : 0;
}
int nft_commit(struct nft_handle *h)
diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c
index 3b14a9f..4f196fc 100644
--- a/iptables/xtables-restore.c
+++ b/iptables/xtables-restore.c
@@ -266,22 +266,11 @@
* global commit at once, stick by now to
* the existing behaviour.
*/
- if (nft_commit(&h)) {
- fprintf(stderr, "Failed to commit "
- "table %s\n",
- curtable);
- }
DEBUGP("Calling commit\n");
- ret = 1;
+ ret = nft_commit(&h);
} else {
- if (nft_abort(&h)) {
- xtables_error(OTHER_PROBLEM,
- "Failed to abort "
- "commit in table %s\n",
- curtable);
- }
DEBUGP("Not calling commit, testing\n");
- ret = 1;
+ ret = nft_abort(&h);
}
in_table = 0;
