- markus@cvs.openbsd.org 2001/06/23 03:04:42

     [auth2.c auth-rh-rsa.c]
     restore correct ignore_user_known_hosts logic.

diff --git a/ChangeLog b/ChangeLog
index 0d38c8bec30eaf406db38badfdc94c2b01bacf05..2ae6b1ba2b76004a843edf2743a56f782450a7b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/auth-rh-rsa.c b/auth-rh-rsa.c
index 870436b55163d074fc9eac6189258adefca8e606..5bca5a9702d695c64e317801356d350fba0aef97 100644 (file)
--- 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);
 

diff --git a/auth2.c b/auth2.c
index 3d2dcdc6c5d3bd4da9e9a29ce3f273fa62981870..272683bb26726a546cf3412d8bfabfddd336ed7e 100644 (file)
--- a/auth2.c
+++ b/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>
 
@@ -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);
 }