Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 370793 | Differences between
and this patch

Collapse All | Expand All

(-)a/tc/m_xt.c (-2 / +10 lines)
Lines 162-168 static int parse_ipt(struct action_util *a,int *argc_p, Link Here
162
					return -1;
162
					return -1;
163
				}
163
				}
164
				tcipt_globals.opts =
164
				tcipt_globals.opts =
165
				    xtables_merge_options(tcipt_globals.opts,
165
				    xtables_merge_options(
166
#if XTABLES_VERSION_CODE > 5
167
				                          tcipt_globals.orig_opts,
168
#endif
169
				                          tcipt_globals.opts,
166
				                          m->extra_opts,
170
				                          m->extra_opts,
167
				                          &m->option_offset);
171
				                          &m->option_offset);
168
			} else {
172
			} else {
Lines 307-313 print_ipt(struct action_util *au,FILE * f, struct rtattr *arg) Link Here
307
			}
311
			}
308
312
309
			tcipt_globals.opts =
313
			tcipt_globals.opts =
310
			    xtables_merge_options(tcipt_globals.opts,
314
			    xtables_merge_options(
315
#if XTABLES_VERSION_CODE > 5
316
			                          tcipt_globals.orig_opts,
317
#endif
318
			                          tcipt_globals.opts,
311
			                          m->extra_opts,
319
			                          m->extra_opts,
312
			                          &m->option_offset);
320
			                          &m->option_offset);
313
		} else {
321
		} else {

Return to bug 370793