diff options
author | djm@openbsd.org <djm@openbsd.org> | 2023-05-24 23:01:06 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2023-05-25 09:42:00 +1000 |
commit | fcd78e31cdd45a7e69ccfe6d8a3b1037dc1de290 (patch) | |
tree | e00bc56a3e8876fd6eaaeb71d17b67e267e71671 /servconf.c | |
parent | 5ec5504f1d328d5bfa64280cd617c3efec4f78f3 (diff) |
upstream: fix AuthorizedPrincipalsCommand when AuthorizedKeysCommand
appears previously in configuration. Reported by John Meyers in bz3574 ok
dtucker@
OpenBSD-Commit-ID: 1c92e4517284386703936e1d3abaa36cfacf1951
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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; |