From a5ad3a9db5a48f350f257a67b62fafd719ecb7e0 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Wed, 21 Sep 2016 16:55:42 +0000 Subject: upstream commit Revert two recent changes to negated address matching. The new behaviour offers unintuitive surprises. We'll find a better way to deal with single negated matches. match.c 1.31: > fix matching for pattern lists that contain a single negated match, > e.g. "Host !example" > > report and patch from Robin Becker. bz#1918 ok dtucker@ addrmatch.c 1.11: > 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: ec96c770f0f5b9a54e5e72fda25387545e9c80c6 --- addrmatch.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'addrmatch.c') diff --git a/addrmatch.c b/addrmatch.c index cba1854e..8658e105 100644 --- a/addrmatch.c +++ b/addrmatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: addrmatch.c,v 1.12 2016/08/23 08:17:42 djm Exp $ */ +/* $OpenBSD: addrmatch.c,v 1.13 2016/09/21 16:55:42 djm Exp $ */ /* * Copyright (c) 2004-2008 Damien Miller @@ -411,8 +411,7 @@ 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 */ -- cgit v1.2.1