diff options
| author |   markus <markus@openbsd.org> | 2001-06-23 03:04:42 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2001-06-23 03:04:42 +0000 |
| commit | 39abf3f99be043ccb10e31133dacf996779a28bc (patch) | |
| tree | bf408c5e2a26ff70a0586681819a105818a7e331 | |
| parent | draft-ietf-secsh-dh-group-exchange-01.txt (diff) | |
| download | wireguard-openbsd-39abf3f99be043ccb10e31133dacf996779a28bc.tar.xz wireguard-openbsd-39abf3f99be043ccb10e31133dacf996779a28bc.zip | |
restore correct ignore_user_known_hosts logic.
| -rw-r--r-- | usr.bin/ssh/auth-rh-rsa.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/auth2.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/auth-rh-rsa.c b/usr.bin/ssh/auth-rh-rsa.c index 870436b5516..5bca5a9702d 100644 --- a/usr.bin/ssh/auth-rh-rsa.c +++ b/usr.bin/ssh/auth-rh-rsa.c @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-rh-rsa.c,v 1.24 2001/06/23 00:20:57 markus Exp $"); +RCSID("$OpenBSD: auth-rh-rsa.c,v 1.25 2001/06/23 03:04:42 markus Exp $"); #include "packet.h" #include "xmalloc.h" @@ -61,7 +61,7 @@ auth_rhosts_rsa(struct passwd *pw, const char *client_user, RSA *client_host_key host_status = check_key_in_hostfiles(pw, client_key, canonical_hostname, _PATH_SSH_SYSTEM_HOSTFILE, - options.ignore_user_known_hosts ? _PATH_SSH_USER_HOSTFILE : NULL); + options.ignore_user_known_hosts ? NULL : _PATH_SSH_USER_HOSTFILE); key_free(client_key); diff --git a/usr.bin/ssh/auth2.c b/usr.bin/ssh/auth2.c index 805182c944f..06643514e17 100644 --- a/usr.bin/ssh/auth2.c +++ b/usr.bin/ssh/auth2.c @@ -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> @@ -739,14 +739,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); } |