summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--auth-rh-rsa.c4
-rw-r--r--auth2.c8
3 files changed, 10 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 639bfbc5f..65933c7bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,9 @@
54 - markus@cvs.openbsd.org 2001/06/23 03:03:59 54 - markus@cvs.openbsd.org 2001/06/23 03:03:59
55 [sshd.8] 55 [sshd.8]
56 draft-ietf-secsh-dh-group-exchange-01.txt 56 draft-ietf-secsh-dh-group-exchange-01.txt
57 - markus@cvs.openbsd.org 2001/06/23 03:04:42
58 [auth2.c auth-rh-rsa.c]
59 restore correct ignore_user_known_hosts logic.
57 60
5820010622 6120010622
59 - (stevesk) handle systems without pw_expire and pw_change. 62 - (stevesk) handle systems without pw_expire and pw_change.
@@ -5738,4 +5741,4 @@
5738 - Wrote replacements for strlcpy and mkdtemp 5741 - Wrote replacements for strlcpy and mkdtemp
5739 - Released 1.0pre1 5742 - Released 1.0pre1
5740 5743
5741$Id: ChangeLog,v 1.1310 2001/06/25 04:39:22 mouring Exp $ 5744$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 870436b55..5bca5a970 100644
--- a/auth-rh-rsa.c
+++ b/auth-rh-rsa.c
@@ -13,7 +13,7 @@
13 */ 13 */
14 14
15#include "includes.h" 15#include "includes.h"
16RCSID("$OpenBSD: auth-rh-rsa.c,v 1.24 2001/06/23 00:20:57 markus Exp $"); 16RCSID("$OpenBSD: auth-rh-rsa.c,v 1.25 2001/06/23 03:04:42 markus Exp $");
17 17
18#include "packet.h" 18#include "packet.h"
19#include "xmalloc.h" 19#include "xmalloc.h"
@@ -61,7 +61,7 @@ auth_rhosts_rsa(struct passwd *pw, const char *client_user, RSA *client_host_key
61 61
62 host_status = check_key_in_hostfiles(pw, client_key, canonical_hostname, 62 host_status = check_key_in_hostfiles(pw, client_key, canonical_hostname,
63 _PATH_SSH_SYSTEM_HOSTFILE, 63 _PATH_SSH_SYSTEM_HOSTFILE,
64 options.ignore_user_known_hosts ? _PATH_SSH_USER_HOSTFILE : NULL); 64 options.ignore_user_known_hosts ? NULL : _PATH_SSH_USER_HOSTFILE);
65 65
66 key_free(client_key); 66 key_free(client_key);
67 67
diff --git a/auth2.c b/auth2.c
index 3d2dcdc6c..272683bb2 100644
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth2.c,v 1.64 2001/06/23 00:20:58 markus Exp $"); 26RCSID("$OpenBSD: auth2.c,v 1.65 2001/06/23 03:04:43 markus Exp $");
27 27
28#include <openssl/evp.h> 28#include <openssl/evp.h>
29 29
@@ -791,14 +791,14 @@ hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost,
791 791
792 host_status = check_key_in_hostfiles(pw, key, lookup, 792 host_status = check_key_in_hostfiles(pw, key, lookup,
793 _PATH_SSH_SYSTEM_HOSTFILE, 793 _PATH_SSH_SYSTEM_HOSTFILE,
794 options.ignore_user_known_hosts ? _PATH_SSH_USER_HOSTFILE : NULL); 794 options.ignore_user_known_hosts ? NULL : _PATH_SSH_USER_HOSTFILE);
795 795
796 /* backward compat if no key has been found. */ 796 /* backward compat if no key has been found. */
797 if (host_status == HOST_NEW) 797 if (host_status == HOST_NEW)
798 host_status = check_key_in_hostfiles(pw, key, lookup, 798 host_status = check_key_in_hostfiles(pw, key, lookup,
799 _PATH_SSH_SYSTEM_HOSTFILE2, 799 _PATH_SSH_SYSTEM_HOSTFILE2,
800 options.ignore_user_known_hosts ? _PATH_SSH_USER_HOSTFILE2 : 800 options.ignore_user_known_hosts ? NULL :
801 NULL); 801 _PATH_SSH_USER_HOSTFILE2);
802 802
803 return (host_status == HOST_OK); 803 return (host_status == HOST_OK);
804} 804}