From: djm@openbsd.org <djm@openbsd.org>
Date: Tue, 23 Aug 2016 03:22:49 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_4_P1~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4067ec8a4c64ccf16250c35ff577b4422767da64;p=thirdparty%2Fopenssh-portable.git

upstream commit

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@

Upstream-ID: 05a0cb323ea4bc20e98db099b42c067bfb9ea1ea
---

diff --git a/match.c b/match.c
index 913b6bae0..fd784ff14 100644
--- a/match.c
+++ b/match.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: match.c,v 1.30 2015/05/04 06:10:48 djm Exp $ */
+/* $OpenBSD: match.c,v 1.31 2016/08/23 03:22:49 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -158,7 +158,8 @@ match_pattern_list(const char *string, const char *pattern, int dolower)
 				return -1;		/* Negative */
 			else
 				got_positive = 1;	/* Positive */
-		}
+		} else if (negated)
+			got_positive = 1;
 	}
 
 	/*