diff options
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c index f9e2f2dfd..e09e0f1c8 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.c,v 1.204 2010/03/04 10:36:03 djm Exp $ */ | 1 | /* $OpenBSD: servconf.c,v 1.205 2010/03/12 01:06:25 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -1223,7 +1223,17 @@ process_server_config_line(ServerOptions *options, char *line, | |||
1223 | charptr = (opcode == sAuthorizedKeysFile) ? | 1223 | charptr = (opcode == sAuthorizedKeysFile) ? |
1224 | &options->authorized_keys_file : | 1224 | &options->authorized_keys_file : |
1225 | &options->authorized_keys_file2; | 1225 | &options->authorized_keys_file2; |
1226 | goto parse_filename; | 1226 | arg = strdelim(&cp); |
1227 | if (!arg || *arg == '\0') | ||
1228 | fatal("%s line %d: missing file name.", | ||
1229 | filename, linenum); | ||
1230 | if (*activep && *charptr == NULL) { | ||
1231 | *charptr = derelativise_path(arg); | ||
1232 | /* increase optional counter */ | ||
1233 | if (intptr != NULL) | ||
1234 | *intptr = *intptr + 1; | ||
1235 | } | ||
1236 | break; | ||
1227 | 1237 | ||
1228 | case sClientAliveInterval: | 1238 | case sClientAliveInterval: |
1229 | intptr = &options->client_alive_interval; | 1239 | intptr = &options->client_alive_interval; |