diff options
author | Phil Sutter <phil@nwl.cc> | 2022-05-05 23:48:50 +0200 |
---|---|---|
committer | Phil Sutter <phil@nwl.cc> | 2022-05-11 12:02:35 +0200 |
commit | fd64a5871b671a66f1ba6d6e3aa83ed24d92c099 (patch) | |
tree | 433b4f605c9108c6576aa9539fbab1efb3385f01 /iptables/xtables-eb.c | |
parent | 3b8a6a6fa870c5ed4a2c533fcec9524bc98e5709 (diff) |
libxtables: Drop xtables_globals 'optstring' field
Define the different optstrings in xshared.h instead, they are not
relevant for other libxtables users.
This is a partial revert of commit 65b150ae382a8 ("xshared: Store
optstring in xtables_globals") to avoid breaking libxtables' ABI
compatibility.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables/xtables-eb.c')
-rw-r--r-- | iptables/xtables-eb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c index a7bfb9c5..3d15063e 100644 --- a/iptables/xtables-eb.c +++ b/iptables/xtables-eb.c @@ -220,7 +220,6 @@ struct option ebt_original_options[] = struct xtables_globals ebtables_globals = { .option_offset = 0, .program_version = PACKAGE_VERSION " (nf_tables)", - .optstring = OPTSTRING_COMMON "hv", .orig_opts = ebt_original_options, .compat_rev = nft_compatible_revision, }; @@ -734,7 +733,7 @@ int do_commandeb(struct nft_handle *h, int argc, char *argv[], char **table, opterr = false; /* Getopt saves the day */ - while ((c = getopt_long(argc, argv, xt_params->optstring, + while ((c = getopt_long(argc, argv, EBT_OPTSTRING, opts, NULL)) != -1) { cs.c = c; switch (c) { |