upstream: Output the current name for PermitRootLogin's

"prohibit-password" in sshd -T instead of its deprecated alias
"without-password".  bz#3788, patch from cjwatson at debian.org.

OpenBSD-Commit-ID: 2d5df18d5ad33a9b6c7547ec78a8e6ea13813df9

diff --git a/servconf.c b/servconf.c
index f7bc92377db3db05fea0b35d95d3bdd2f4f3bb33..f2a540dad54ec8de1856bd92773e617eb26fa208 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.425 2025/02/25 06:25:30 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.426 2025/05/22 04:22:03 dtucker Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -1282,8 +1282,8 @@ static const struct multistate multistate_addressfamily[] = {
        { NULL, -1 }
 };
 static const struct multistate multistate_permitrootlogin[] = {
-       { "without-password",           PERMIT_NO_PASSWD },
        { "prohibit-password",          PERMIT_NO_PASSWD },
+       { "without-password",           PERMIT_NO_PASSWD },
        { "forced-commands-only",       PERMIT_FORCED_ONLY },
        { "yes",                        PERMIT_YES },
        { "no",                         PERMIT_NO },