a2ea441692
- Install an improved sample config - Fix permissions of osf-related configs - rule: Fix for potential off-by-one in cmd_add_loc() - netlink_delinearize: Fix suspicious calloc() call - netlink: Avoid memleak in error path of netlink_delinearize_obj() - netlink: Avoid memleak in error path of netlink_delinearize_table() - netlink: Avoid memleak in error path of netlink_delinearize_chain() - netlink: Avoid memleak in error path of netlink_delinearize_set() - json: Drop pointless assignment in exthdr_expr_json() - evaluate: Mark fall through case in str2hooknum() - parser_json: Fix for memleak in tcp option error path - parser_bison: Fix for implicit declaration of isalnum - main: fix nft --help output fallout from 719e4427 - tests: add icmp/6 test where dependency should be left alone - payload: check icmp dependency before removing previous icmp expression Resolves: rhbz#1933117, rhbz#1938823, rhbz#1931790, rhbz#1964987, rhbz#1971600
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
From 5f91359f1bbcd73346e4469f0b5a30e04f107a06 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= <snemec@redhat.com>
|
|
Date: Mon, 22 Feb 2021 13:03:19 +0100
|
|
Subject: [PATCH] main: fix nft --help output fallout from 719e4427
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Long options were missing the double dash.
|
|
|
|
Fixes: 719e44277f8e ("main: use one data-structure to initialize getopt_long(3) arguments and help.")
|
|
Cc: Jeremy Sowden <jeremy@azazel.net>
|
|
Signed-off-by: Štěpán Němec <snemec@redhat.com>
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
(cherry picked from commit b8c6dd1a9c0c6e937febc113e7ea89079aa945be)
|
|
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
---
|
|
src/main.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/main.c b/src/main.c
|
|
index 80cf1acf0f7f4..8c47064459ecb 100644
|
|
--- a/src/main.c
|
|
+++ b/src/main.c
|
|
@@ -175,16 +175,17 @@ static const struct option *get_options(void)
|
|
|
|
static void print_option(const struct nft_opt *opt)
|
|
{
|
|
- char optbuf[33] = "";
|
|
+ char optbuf[35] = "";
|
|
int i;
|
|
|
|
i = snprintf(optbuf, sizeof(optbuf), " -%c", opt->val);
|
|
if (opt->name)
|
|
- i += snprintf(optbuf + i, sizeof(optbuf) - i, ", %s", opt->name);
|
|
+ i += snprintf(optbuf + i, sizeof(optbuf) - i, ", --%s",
|
|
+ opt->name);
|
|
if (opt->arg)
|
|
i += snprintf(optbuf + i, sizeof(optbuf) - i, " %s", opt->arg);
|
|
|
|
- printf("%-32s%s\n", optbuf, opt->help);
|
|
+ printf("%-34s%s\n", optbuf, opt->help);
|
|
}
|
|
|
|
static void show_help(const char *name)
|
|
--
|
|
2.31.1
|
|
|