Update xshared.c

Author: splitice

ipthelper/xshared.c

@@ -196,12 +196,12 @@ int command_default(struct iptables_command_state *cs,
 			old = (existing == gl->orig_opts) ? NULL : existing;
 
 			if (m->x6_options != NULL)
-				gl->opts = xtables_options_xfrm(gl->orig_opts,
+				gl->opts = xtables_options_xfrm(gl->opts,
 							old,
 							m->x6_options,
 							&m->option_offset);
 			else
-				gl->opts = xtables_merge_options(gl->orig_opts,
+				gl->opts = xtables_merge_options(gl->opts,
 							old,
 							m->extra_opts,
 							&m->option_offset);
@@ -614,10 +614,10 @@ void command_match(struct iptables_command_state *cs)
 
 	old = (existing == xt_params->orig_opts) ? NULL : existing;
 	if (m->x6_options != NULL) {
-		opts = xtables_options_xfrm(xt_params->orig_opts, old,
+		opts = xtables_options_xfrm(xt_params->opts, old,
 				    m->x6_options, &m->option_offset);
 	} else if (m->extra_opts != NULL) {
-		opts = xtables_merge_options(xt_params->orig_opts, old,
+		opts = xtables_merge_options(xt_params->opts, old,
 				      m->extra_opts, &m->option_offset);
 	} else {
 		return;
@@ -687,11 +687,11 @@ void command_jump(struct iptables_command_state *cs)
 
 	old = (existing == xt_params->orig_opts) ? NULL : existing;
 	if (cs->target->x6_options != NULL)
-		opts = xtables_options_xfrm(xt_params->orig_opts, old,
+		opts = xtables_options_xfrm(xt_params->opts, old,
 				    cs->target->x6_options,
 				    &cs->target->option_offset);
 	else if (cs->target->extra_opts != NULL)
-		opts = xtables_merge_options(xt_params->orig_opts, old,
+		opts = xtables_merge_options(xt_params->opts, old,
 				    cs->target->extra_opts,
 				    &cs->target->option_offset);
 	else