From: djm@openbsd.org <djm@openbsd.org>
Date: Wed, 24 May 2023 23:01:06 +0000 (+0000)
Subject: upstream: fix AuthorizedPrincipalsCommand when AuthorizedKeysCommand
X-Git-Tag: V_9_4_P1~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcd78e31cdd45a7e69ccfe6d8a3b1037dc1de290;p=thirdparty%2Fopenssh-portable.git

upstream: fix AuthorizedPrincipalsCommand when AuthorizedKeysCommand

appears previously in configuration. Reported by John Meyers in bz3574 ok
dtucker@

OpenBSD-Commit-ID: 1c92e4517284386703936e1d3abaa36cfacf1951
---

diff --git a/servconf.c b/servconf.c
index 9d5b73ecf..0f4fd2f17 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.392 2023/03/05 05:34:09 dtucker Exp $ */
+/* $OpenBSD: servconf.c,v 1.393 2023/05/24 23:01:06 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -2403,7 +2403,7 @@ process_server_config_line_depth(ServerOptions *options, char *line,
 			fatal("%.200s line %d: %s must be an absolute path",
 			    filename, linenum, keyword);
 		}
-		if (*activep && options->authorized_keys_command == NULL)
+		if (*activep && *charptr == NULL)
 			*charptr = xstrdup(str + len);
 		argv_consume(&ac);
 		break;