From 513ea504b19104142fe6a32049bb705ba77e3da7 Mon Sep 17 00:00:00 2001 From: mikeb Date: Mon, 13 Apr 2015 16:52:26 +0000 Subject: [PATCH] Make filter argument to ipsp_aux_match optional like the rest of them. OK markus, hshoexer --- sys/netinet/ip_ipsp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c index 524d339ceeb..0c93cf6e480 100644 --- a/sys/netinet/ip_ipsp.c +++ b/sys/netinet/ip_ipsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.c,v 1.207 2015/04/13 16:48:01 mikeb Exp $ */ +/* $OpenBSD: ip_ipsp.c,v 1.208 2015/04/13 16:52:26 mikeb Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr), @@ -359,7 +359,8 @@ ipsp_aux_match(struct tdb *tdb, return 0; /* Check for filter matches. */ - if (tdb->tdb_filter.sen_type) { + if (pfilter != NULL && pfiltermask != NULL && + tdb->tdb_filter.sen_type) { /* * XXX We should really be doing a subnet-check (see * whether the TDB-associated filter is a subset -- 2.20.1