From 1a5153117784c267ceb81c048dd5e9b9c4309fbb Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Mon, 29 Oct 2018 12:49:00 +0100 Subject: src: default to numeric UID and GID listing Like iptables-save, print UID and GID as numeric values by default. Add a new option `-u' to print the UID and GID names as defined by /etc/passwd and /etc/group. Note that -n is ignored after this patch, since default are numeric printing for UID and GID. Acked-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- src/json.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/json.c') diff --git a/src/json.c b/src/json.c index 5c96bcd0..e90445fc 100644 --- a/src/json.c +++ b/src/json.c @@ -1021,7 +1021,7 @@ json_t *uid_type_json(const struct expr *expr, struct output_ctx *octx) { uint32_t uid = mpz_get_uint32(expr->value); - if (octx->numeric < NFT_NUMERIC_ALL) { + if (nft_output_guid(octx)) { struct passwd *pw = getpwuid(uid); if (pw) @@ -1034,7 +1034,7 @@ json_t *gid_type_json(const struct expr *expr, struct output_ctx *octx) { uint32_t gid = mpz_get_uint32(expr->value); - if (octx->numeric < NFT_NUMERIC_ALL) { + if (nft_output_guid(octx)) { struct group *gr = getgrgid(gid); if (gr) -- cgit v1.2.3