Attachment #120065 for bug #179496

View | Details | Raw Unified | Return to bug 179496
Collapse All | Expand All




		m->m = xcalloc(size, 1);
		m->m->u.match_size = size;
		strcpy(m->m->u.user.name, m->name);
		if(m->init)
			m->init(m->m, &fw.nfcache);

		if (d->sport[0]!='\0' || d->dport[0]!='\0') {
			if (!strcmp(d->protocol, "tcp")) {

					m->m = xcalloc(1, size);
					m->m->u.match_size = size;
					strcpy(m->m->u.user.name, m->name);
					if(m->init)
						m->init(m->m, &fw.nfcache);
					opts = merge_options(opts, m->extra_opts, 
							&m->option_offset);
					break;

Return to bug 179496

Lines 1330-1336 Link Here

(-)agents/iptables/iptables.c.orig (-2 / +4 lines)
1330	m->m = xcalloc(size, 1);	1330	m->m = xcalloc(size, 1);
1331	m->m->u.match_size = size;	1331	m->m->u.match_size = size;
1332	strcpy(m->m->u.user.name, m->name);	1332	strcpy(m->m->u.user.name, m->name);
1333	m->init(m->m, &fw.nfcache);	1333	if(m->init)
		1334	m->init(m->m, &fw.nfcache);
1334		1335
1335	if (d->sport[0]!='\0' \|\| d->dport[0]!='\0') {	1336	if (d->sport[0]!='\0' \|\| d->dport[0]!='\0') {
1336	if (!strcmp(d->protocol, "tcp")) {	1337	if (!strcmp(d->protocol, "tcp")) {
Lines 1378-1384 Link Here
1378	m->m = xcalloc(1, size);	1379	m->m = xcalloc(1, size);
1379	m->m->u.match_size = size;	1380	m->m->u.match_size = size;
1380	strcpy(m->m->u.user.name, m->name);	1381	strcpy(m->m->u.user.name, m->name);
1381	m->init(m->m, &fw.nfcache);	1382	if(m->init)
		1383	m->init(m->m, &fw.nfcache);
1382	opts = merge_options(opts, m->extra_opts,	1384	opts = merge_options(opts, m->extra_opts,
1383	&m->option_offset);	1385	&m->option_offset);
1384	break;	1386	break;