From: djm@openbsd.org <djm@openbsd.org>
Date: Mon, 17 Jul 2023 06:16:33 +0000 (+0000)
Subject: upstream: missing match localnetwork negation check
X-Git-Tag: V_9_4_P1~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b87b03282e466ca2927954ce93f5dbf0bfdc68f6;p=thirdparty%2Fopenssh-portable.git

upstream: missing match localnetwork negation check

OpenBSD-Commit-ID: 9a08ed8dae27d3f38cf280f1b28d4e0ff41a737a
---

diff --git a/readconf.c b/readconf.c
index debb0c417..fe61616e8 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.379 2023/07/17 04:08:31 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.380 2023/07/17 06:16:33 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -748,6 +748,8 @@ match_cfg_line(Options *options, char **condition, struct passwd *pw,
 				goto out;
 			}
 			r = check_match_ifaddrs(arg) == 1;
+			if (r == (negate ? 1 : 0))
+				this_result = result = 0;
 		} else if (strcasecmp(attrib, "tagged") == 0) {
 			criteria = xstrdup(options->tag == NULL ? "" :
 			    options->tag);