mirror of git://anongit.mindrot.org/openssh.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
This commit is contained in:
parent
83b581862a
commit
4067ec8a4c
5
match.c
5
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>
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
* 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 */
|
return -1; /* Negative */
|
||||||
else
|
else
|
||||||
got_positive = 1; /* Positive */
|
got_positive = 1; /* Positive */
|
||||||
}
|
} else if (negated)
|
||||||
|
got_positive = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue