d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix expansion of AuthorizedKeysFile (upstream patch)

Browse Source 
PR:		146334, 145940
Approved by:	re (kib@)
This commit is contained in:
Dag-Erling Smørgrav 2010-06-02 10:26:31 +00:00
parent 875e0aa40d
commit a97329ecda
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/openssh/servconf.c
View File

@ -1227,7 +1227,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 = tilde_expand_filename(arg, getuid());
/* increase optional counter */
if (intptr != NULL)
*intptr = *intptr + 1;
}
break;
case sClientAliveInterval: case sClientAliveInterval:
intptr = &options->client_alive_interval; intptr = &options->client_alive_interval;