From: djm@openbsd.org <djm@openbsd.org>
Date: Tue, 25 Feb 2025 06:25:30 +0000 (+0000)
Subject: upstream: ressurect fix for "match invalid-user" that got clobbered
X-Git-Tag: V_10_0_P1~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb99e8eb228df366af33f4fe88d7a9dd0dbf0756;p=thirdparty%2Fopenssh-portable.git

upstream: ressurect fix for "match invalid-user" that got clobbered

by 1.423

OpenBSD-Commit-ID: d18bf0945976e0f3467d710d4bc8bdbe181c0567
---

diff --git a/servconf.c b/servconf.c
index c5c1713c2..f7bc92377 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.424 2025/02/15 01:52:07 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.425 2025/02/25 06:25:30 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1079,8 +1079,10 @@ match_cfg_line(const char *full_line, int *acp, char ***avp,
 		}
 		/* Criterion "invalid-user" also has no argument */
 		if (strcasecmp(attrib, "invalid-user") == 0) {
-			if (ci == NULL)
+			if (ci == NULL) {
+				result = 0;
 				continue;
+			}
 			if (ci->user_invalid == 0)
 				result = 0;
 			else