]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: ressurect fix for "match invalid-user" that got clobbered
authordjm@openbsd.org <djm@openbsd.org>
Tue, 25 Feb 2025 06:25:30 +0000 (06:25 +0000)
committerDamien Miller <djm@mindrot.org>
Tue, 25 Feb 2025 09:57:26 +0000 (20:57 +1100)
by 1.423

OpenBSD-Commit-ID: d18bf0945976e0f3467d710d4bc8bdbe181c0567

servconf.c

index c5c1713c295725a7eecfd022efe9eff2165a65ab..f7bc92377db3db05fea0b35d95d3bdd2f4f3bb33 100644 (file)
@@ -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