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 | |
| parent | 3c798d47438d421e64d742ec50d08cc4c841ee60 (diff) | |
- markus@cvs.openbsd.org 2001/06/23 03:04:42
[auth2.c auth-rh-rsa.c]
restore correct ignore_user_known_hosts logic.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | auth-rh-rsa.c | 4 | ||||
| -rw-r--r-- | auth2.c | 8 |
3 files changed, 10 insertions, 7 deletions
@@ -54,6 +54,9 @@ - markus@cvs.openbsd.org 2001/06/23 03:03:59 [sshd.8] draft-ietf-secsh-dh-group-exchange-01.txt + - markus@cvs.openbsd.org 2001/06/23 03:04:42 + [auth2.c auth-rh-rsa.c] + restore correct ignore_user_known_hosts logic. 20010622 - (stevesk) handle systems without pw_expire and pw_change. @@ -5738,4 +5741,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1310 2001/06/25 04:39:22 mouring Exp $ +$Id: ChangeLog,v 1.1311 2001/06/25 04:40:49 mouring Exp $ diff --git a/auth-rh-rsa.c b/auth-rh-rsa.c index 870436b5..5bca5a97 100644 --- a/auth-rh-rsa.c +++ b/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); @@ -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); } |