diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-08-23 03:22:49 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-08-23 14:29:07 +1000 |
commit | 4067ec8a4c64ccf16250c35ff577b4422767da64 (patch) | |
tree | 37e7d9420ca322b4efe714e6aa3208dae7e82bf0 /match.c | |
parent | 83b581862a1dbb06fc859959f829dde2654aef3c (diff) |
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
Diffstat (limited to 'match.c')
-rw-r--r-- | match.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: match.c,v 1.30 2015/05/04 06:10:48 djm Exp $ */ | 1 | /* $OpenBSD: match.c,v 1.31 2016/08/23 03:22:49 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * 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) | |||
158 | return -1; /* Negative */ | 158 | return -1; /* Negative */ |
159 | else | 159 | else |
160 | got_positive = 1; /* Positive */ | 160 | got_positive = 1; /* Positive */ |
161 | } | 161 | } else if (negated) |
162 | got_positive = 1; | ||
162 | } | 163 | } |
163 | 164 | ||
164 | /* | 165 | /* |