diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2016-08-23 03:24:10 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-08-23 14:29:08 +1000 |
| commit | cc182d01cef8ca35a1d25ea9bf4e2ff72e588208 (patch) | |
| tree | 8b1f678049fcf9b81bbd6f13e8d7f99658dcded2 /addrmatch.c | |
| parent | 4067ec8a4c64ccf16250c35ff577b4422767da64 (diff) | |
upstream commit
fix negated address matching where the address list
consists of a single negated match, e.g. "Match addr !192.20.0.1"
Report and patch from Jakub Jelen. bz#2397 ok dtucker@
Upstream-ID: 01dcac3f3e6ca47518cf293e31c73597a4bb40d8
Diffstat (limited to 'addrmatch.c')
| -rw-r--r-- | addrmatch.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/addrmatch.c b/addrmatch.c index 70b050e0..6a7ab7d4 100644 --- a/addrmatch.c +++ b/addrmatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: addrmatch.c,v 1.10 2015/07/08 19:04:21 markus Exp $ */ +/* $OpenBSD: addrmatch.c,v 1.11 2016/08/23 03:24:10 djm Exp $ */ /* * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org> @@ -411,7 +411,8 @@ addr_match_list(const char *addr, const char *_list) break; } ret = 1; - } + } else if (neg) + ret = 1; continue; } else { /* If CIDR parse failed, try wildcard string match */ |