[src/netbsd-1-6]: src/crypto/dist/ssh Pull up revision 1.24 (requested by ito...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6aae47c9abd0
branches:  netbsd-1-6
changeset: 528337:6aae47c9abd0
user:      lukem <lukem%NetBSD.org@localhost>
date:      Wed Jul 03 23:01:31 2002 +0000

description:
Pull up revision 1.24 (requested by itojun in ticket #428):
make ssh-keysign read /etc/ssh/ssh_config
and exit if HostbasedAuthentication is disabled globally. based on discussions
with deraadt, itojun and sommerfeld; ok itojun@
sync w/openbsd

diffstat:

 crypto/dist/ssh/ssh.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 7725fb4f6d8b -r 6aae47c9abd0 crypto/dist/ssh/ssh.c
--- a/crypto/dist/ssh/ssh.c     Wed Jul 03 23:01:21 2002 +0000
+++ b/crypto/dist/ssh/ssh.c     Wed Jul 03 23:01:31 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ssh.c,v 1.21.2.1 2002/06/26 16:54:18 tv Exp $  */
+/*     $NetBSD: ssh.c,v 1.21.2.2 2002/07/03 23:01:31 lukem Exp $       */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
  * Copyright (c) 1995 Tatu Ylonen <ylo%cs.hut.fi@localhost>, Espoo, Finland
@@ -625,7 +625,8 @@
                    _PATH_HOST_RSA_KEY_FILE, "", NULL);
                PRIV_END;
 
-               if (sensitive_data.keys[0] == NULL &&
+               if (options.hostbased_authentication == 1 &&
+                   sensitive_data.keys[0] == NULL &&
                    sensitive_data.keys[1] == NULL &&
                    sensitive_data.keys[2] == NULL) {
                        sensitive_data.keys[1] = key_load_public(