[openssh-commits] [openssh] 04/06: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 4067ec8a4c64ccf16250c35ff577b4422767da64
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Tue Aug 23 03:22:49 2016 +0000

    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
---
 match.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/match.c b/match.c
index 913b6ba..fd784ff 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 at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at 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;
 	}
 
 	/*

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.