From 0c808b1ee29d4a0974f4cc5c0586138730361a41 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 10 Jan 2020 19:54:16 +0100 Subject: [PATCH] main: restore --debug Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1778883 Upstream Status: nftables commit ea5af85371bd1 commit ea5af85371bd18658ea2ffa0a6c9c48e2c64684b Author: Pablo Neira Ayuso Date: Thu Jan 9 18:16:18 2020 +0100 main: restore --debug Broken since options are mandatory before commands. Fixes: fb9cea50e8b3 ("main: enforce options before commands") Signed-off-by: Pablo Neira Ayuso --- src/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main.c b/src/main.c index 74199f9..6ab1b89 100644 --- a/src/main.c +++ b/src/main.c @@ -46,7 +46,7 @@ enum opt_vals { OPT_TERSE = 't', OPT_INVALID = '?', }; -#define OPTSTRING "+hvcf:iI:jvnsNaeSupypTt" +#define OPTSTRING "+hvd:cf:iI:jvnsNaeSupypTt" static const struct option options[] = { { @@ -228,8 +228,10 @@ static bool nft_options_check(int argc, char * const argv[]) if (nonoption) { nft_options_error(argc, argv, pos); return false; - } else if (argv[i][1] == 'I' || + } else if (argv[i][1] == 'd' || + argv[i][1] == 'I' || argv[i][1] == 'f' || + !strcmp(argv[i], "--debug") || !strcmp(argv[i], "--includepath") || !strcmp(argv[i], "--file")) { skip = true; -- 1.8.3.1