diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2001-06-25 04:40:49 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-06-25 04:40:49 +0000 |
| commit | a4789ef8785c4ac37187cf3b9b937524d2823b4b (patch) | |
| tree | 624c08d161ec0c0a06315a41dfe43823f25f766a /auth2.c | |
| parent | 3c798d47438d421e64d742ec50d08cc4c841ee60 (diff) | |
| download | openssh-git-a4789ef8785c4ac37187cf3b9b937524d2823b4b.tar.gz | |
- markus@cvs.openbsd.org 2001/06/23 03:04:42
[auth2.c auth-rh-rsa.c]
restore correct ignore_user_known_hosts logic.
Diffstat (limited to 'auth2.c')
| -rw-r--r-- | auth2.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2.c,v 1.64 2001/06/23 00:20:58 markus Exp $"); +RCSID("$OpenBSD: auth2.c,v 1.65 2001/06/23 03:04:43 markus Exp $"); #include <openssl/evp.h> @@ -791,14 +791,14 @@ hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost, host_status = check_key_in_hostfiles(pw, key, lookup, _PATH_SSH_SYSTEM_HOSTFILE, - options.ignore_user_known_hosts ? _PATH_SSH_USER_HOSTFILE : NULL); + options.ignore_user_known_hosts ? NULL : _PATH_SSH_USER_HOSTFILE); /* backward compat if no key has been found. */ if (host_status == HOST_NEW) host_status = check_key_in_hostfiles(pw, key, lookup, _PATH_SSH_SYSTEM_HOSTFILE2, - options.ignore_user_known_hosts ? _PATH_SSH_USER_HOSTFILE2 : - NULL); + options.ignore_user_known_hosts ? NULL : + _PATH_SSH_USER_HOSTFILE2); return (host_status == HOST_OK); } |