diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2015-04-13 16:52:27 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2015-04-13 16:52:27 +0000 |
| commit | 4fbbb9fffd55af323fb2367bfd82e3c333be930b (patch) | |
| tree | 446bed3adbf92b96cd0c9346ac2c69bd38f5288b | |
| parent | 367e1f080be27bcc4bd38631165c7d62d2234998 (diff) | |
Make filter argument to ipsp_aux_match optional like the rest of them.
OK markus, hshoexer
| -rw-r--r-- | sys/netinet/ip_ipsp.c | 5 |
1 files 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 |