tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: do not attempt to find an absolute path for sshd_config 

SecurityKeyProvider=internal - unbreaks cfgparse regress test

OpenBSD-Commit-ID: d2ddcf525c0dc3c8339522360c10b3c70f1fd641
This commit is contained in:
djm@openbsd.org 2019-12-15 20:57:15 +00:00 committed by Damien Miller
parent 9b6e30b96b
commit 747e25192f
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
servconf.c
View File

@ -1,5 +1,5 @@
/* $OpenBSD: servconf.c,v 1.355 2019/12/15 18:57:30 djm Exp $ */ /* $OpenBSD: servconf.c,v 1.356 2019/12/15 20:57:15 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
@ -2032,7 +2032,18 @@ process_server_config_line(ServerOptions *options, char *line,
case sSecurityKeyProvider: case sSecurityKeyProvider:
charptr = &options->sk_provider; charptr = &options->sk_provider;
goto parse_filename; arg = strdelim(&cp);
if (!arg || *arg == '\0')
fatal("%s line %d: missing file name.",
filename, linenum);
if (*activep && *charptr == NULL) {
*charptr = strcasecmp(arg, "internal") == 0 ?
xstrdup(arg) : derelativise_path(arg);
/* increase optional counter */
if (intptr != NULL)
*intptr = *intptr + 1;
}
break;
case sIPQoS: case sIPQoS:
arg = strdelim(&cp); arg = strdelim(&cp);