summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--addrmatch.c5
-rw-r--r--match.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/addrmatch.c b/addrmatch.c
index cba1854ec..8658e105a 100644
--- a/addrmatch.c
+++ b/addrmatch.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: addrmatch.c,v 1.12 2016/08/23 08:17:42 djm Exp $ */ 1/* $OpenBSD: addrmatch.c,v 1.13 2016/09/21 16:55:42 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org> 4 * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org>
@@ -411,8 +411,7 @@ addr_match_list(const char *addr, const char *_list)
411 break; 411 break;
412 } 412 }
413 ret = 1; 413 ret = 1;
414 } else if (neg) 414 }
415 ret = 1;
416 continue; 415 continue;
417 } else { 416 } else {
418 /* If CIDR parse failed, try wildcard string match */ 417 /* If CIDR parse failed, try wildcard string match */
diff --git a/match.c b/match.c
index fd784ff14..b29a30e91 100644
--- a/match.c
+++ b/match.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: match.c,v 1.31 2016/08/23 03:22:49 djm Exp $ */ 1/* $OpenBSD: match.c,v 1.32 2016/09/21 16:55:42 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,8 +158,7 @@ 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 } else if (negated) 161 }
162 got_positive = 1;
163 } 162 }
164 163
165 /* 164 /*