- 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@

1 files changed, 3 insertions, 2 deletions

diff --git a/sshd.c b/sshd.c
index 4e34f2439..d84db897c 100644
--- a/sshd.c
+++ b/sshd.c
@@ -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;