diff options
| -rw-r--r-- | src/rule.c | 13 | ||||
| -rwxr-xr-x | tests/shell/testcases/listing/0014objects_0 | 7 |
2 files changed, 15 insertions, 5 deletions
@@ -1946,13 +1946,16 @@ static int do_list_obj(struct netlink_ctx *ctx, struct cmd *cmd, uint32_t type) continue; if (cmd->handle.table.name != NULL && - !strcmp(cmd->handle.table.name, table->handle.table.name)) { - nft_print(&ctx->nft->output, "table %s %s {\n", - family2str(table->handle.family), - cmd->handle.table.name); - } else + strcmp(cmd->handle.table.name, table->handle.table.name)) continue; + if (list_empty(&table->objs)) + continue; + + nft_print(&ctx->nft->output, "table %s %s {\n", + family2str(table->handle.family), + table->handle.table.name); + list_for_each_entry(obj, &table->objs, list) { if (obj->type != type || (cmd->handle.obj.name != NULL && diff --git a/tests/shell/testcases/listing/0014objects_0 b/tests/shell/testcases/listing/0014objects_0 index dcfe2e6f..20f68406 100755 --- a/tests/shell/testcases/listing/0014objects_0 +++ b/tests/shell/testcases/listing/0014objects_0 @@ -15,6 +15,13 @@ $NFT add quota test https-quota 25 mbytes $NFT add ct helper test cthelp { type \"sip\" protocol tcp \; } $NFT add table test-ip +GET="$($NFT list quotas)" +if [ "$EXPECTED" != "$GET" ] ; then + DIFF="$(which diff)" + [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + exit 1 +fi + GET="$($NFT list quota test https-quota)" if [ "$EXPECTED" != "$GET" ] ; then DIFF="$(which diff)" |