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 9d5b73ecfc0b8b1cfeace488ad791279c70c3ebc..0f4fd2f17e32cc885586debaec86098637991102 100644 (file)
--- 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;