mirror of
https://github.com/PowerShell/openssh-portable.git
synced 2025-07-27 15:54:22 +02:00
upstream: fix AuthorizedPrincipalsCommand when AuthorizedKeysCommand
appears previously in configuration. Reported by John Meyers in bz3574 ok dtucker@ OpenBSD-Commit-ID: 1c92e4517284386703936e1d3abaa36cfacf1951
This commit is contained in:
parent
5ec5504f1d
commit
fcd78e31cd
@ -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
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||||
* All rights reserved
|
* 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",
|
fatal("%.200s line %d: %s must be an absolute path",
|
||||||
filename, linenum, keyword);
|
filename, linenum, keyword);
|
||||||
}
|
}
|
||||||
if (*activep && options->authorized_keys_command == NULL)
|
if (*activep && *charptr == NULL)
|
||||||
*charptr = xstrdup(str + len);
|
*charptr = xstrdup(str + len);
|
||||||
argv_consume(&ac);
|
argv_consume(&ac);
|
||||||
break;
|
break;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user