tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 08:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2010/03/12 01:06:25

Browse Source 
[servconf.c]
     unbreak AuthorizedKeys option with a $HOME-relative path; reported by
     vinschen AT redhat.com, ok dtucker@
This commit is contained in:
Damien Miller 2010-03-22 05:52:26 +11:00
parent e513a91195
commit c4cb47bc53
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -11,6 +11,10 @@
[auth2-pubkey.c] [auth2-pubkey.c]
correct certificate logging and make it more consistent between correct certificate logging and make it more consistent between
authorized_keys and TrustedCAKeys; ok markus@ authorized_keys and TrustedCAKeys; ok markus@
- djm@cvs.openbsd.org 2010/03/12 01:06:25
[servconf.c]
unbreak AuthorizedKeys option with a $HOME-relative path; reported by
vinschen AT redhat.com, ok dtucker@
20100314 20100314
- (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix

14
servconf.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: servconf.c,v 1.204 2010/03/04 10:36:03 djm Exp $ */ /* $OpenBSD: servconf.c,v 1.205 2010/03/12 01:06:25 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
@ -1223,7 +1223,17 @@ process_server_config_line(ServerOptions *options, char *line,
charptr = (opcode == sAuthorizedKeysFile) ? charptr = (opcode == sAuthorizedKeysFile) ?
&options->authorized_keys_file : &options->authorized_keys_file :
&options->authorized_keys_file2; &options->authorized_keys_file2;
goto parse_filename; arg = strdelim(&cp);
if (!arg || *arg == '\0')
fatal("%s line %d: missing file name.",
filename, linenum);
if (*activep && *charptr == NULL) {
*charptr = derelativise_path(arg);
/* increase optional counter */
if (intptr != NULL)
*intptr = *intptr + 1;
}
break;
case sClientAliveInterval: case sClientAliveInterval:
intptr = &options->client_alive_interval; intptr = &options->client_alive_interval;