diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2010-01-13 12:44:29 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2010-01-13 12:44:29 +0100 |
| commit | 88b6fb2b55a5c8bb9aeadec185991c5bfae780c0 (patch) | |
| tree | 85356ec63439554a143a9e2116f8af61d0e216d5 /sshd.c | |
| parent | - djm@cvs.openbsd.org 2010/01/13 01:40:16 (diff) | |
| download | openssh-88b6fb2b55a5c8bb9aeadec185991c5bfae780c0.tar.xz openssh-88b6fb2b55a5c8bb9aeadec185991c5bfae780c0.zip | |
- djm@cvs.openbsd.org 2010/01/13 03:48:13
[servconf.c servconf.h sshd.c]
avoid run-time failures when specifying hostkeys via a relative
path by prepending the cwd in these cases; bz#1290; ok dtucker@
Diffstat (limited to 'sshd.c')
| -rw-r--r-- | sshd.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.370 2010/01/09 23:04:13 dtucker Exp $ */ +/* $OpenBSD: sshd.c,v 1.371 2010/01/13 03:48:13 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1351,7 +1351,8 @@ main(int ac, char **av) fprintf(stderr, "too many host keys.\n"); exit(1); } - options.host_key_files[options.num_host_key_files++] = optarg; + options.host_key_files[options.num_host_key_files++] = + derelativise_path(optarg); break; case 't': test_flag = 1; |