diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2010-11-15 14:39:50 +0100 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2010-11-15 14:39:50 +0100 |
commit | a905ea5c97149da9d76cd278b0447e3316087a45 (patch) | |
tree | 9dfcf7b635697f8b06492376b8660aeaf5b77be1 | |
parent | 710a132ce9fbecedbf9447f2b2a134f2359a583c (diff) | |
parent | 59e8114c6792242e80785f4461d5e663fb9a3d64 (diff) |
Merge branch 'master' of git://dev.medozas.de/iptables into m2
-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, |