diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2010-11-15 13:19:48 +0100 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2010-11-15 13:19:48 +0100 |
| commit | 59e8114c6792242e80785f4461d5e663fb9a3d64 (patch) | |
| tree | 9dfcf7b635697f8b06492376b8660aeaf5b77be1 | |
| parent | 648fd1ad68ae2ec675ac07efee80783912535404 (diff) | |
iptables: fix longopt reecognition and workaround getopt(3) behavior
* On the first call to getopt, opts was NULL, so long options would
not be recognized until a match/target was loaded.
Whacky getopt behavior:
* If the longopts parameter is NULL, getopt fails to recognize unknown
options, such that `iptables-multi main --append` will print a garbage
help message ("main needs an argument").
* If the longopts parameter is NULL on the first call, but not on
subsequent calls, it completely screws up option parsing, taking
the --dport in `iptables-multi main -A INPUT -p tcp --dport 1000`
as --destination instead, but not accepting "--destination 1.2.3.4"
either.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
| -rw-r--r-- | ip6tables.c | 1 | ||||
| -rw-r--r-- | iptables.c | 1 | ||||
| -rw-r--r-- | xtables.c | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/ip6tables.c b/ip6tables.c index 150893d4..8318f910 100644 --- a/ip6tables.c +++ b/ip6tables.c @@ -147,6 +147,7 @@ void ip6tables_exit_error(enum xtables_exittype status, const char *msg, ...) __ struct xtables_globals ip6tables_globals = { .option_offset = 0, .program_version = IPTABLES_VERSION, + .opts = original_opts, .orig_opts = original_opts, .exit_err = ip6tables_exit_error, }; @@ -147,6 +147,7 @@ void iptables_exit_error(enum xtables_exittype status, const char *msg, ...) __a struct xtables_globals iptables_globals = { .option_offset = 0, .program_version = IPTABLES_VERSION, + .opts = original_opts, .orig_opts = original_opts, .exit_err = iptables_exit_error, }; @@ -75,7 +75,8 @@ void basic_exit_err(enum xtables_exittype status, const char *msg, ...) void xtables_free_opts(int unused) { - free(xt_params->opts); + if (xt_params->opts != xt_params->orig_opts) + free(xt_params->opts); } struct option *xtables_merge_options(struct option *orig_opts, |