tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

[auth2.c auth-rh-rsa.c]
     restore correct ignore_user_known_hosts logic.
This commit is contained in:
Ben Lindstrom 2001-06-25 04:40:49 +00:00
parent 3c798d4743
commit a4789ef878
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -54,6 +54,9 @@
- markus@cvs.openbsd.org 2001/06/23 03:03:59 - markus@cvs.openbsd.org 2001/06/23 03:03:59
[sshd.8] [sshd.8]
draft-ietf-secsh-dh-group-exchange-01.txt 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 20010622
- (stevesk) handle systems without pw_expire and pw_change. - (stevesk) handle systems without pw_expire and pw_change.
@ -5738,4 +5741,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

4
auth-rh-rsa.c
View File

@ -13,7 +13,7 @@
*/ */
#include "includes.h" #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 "packet.h"
#include "xmalloc.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, host_status = check_key_in_hostfiles(pw, client_key, canonical_hostname,
_PATH_SSH_SYSTEM_HOSTFILE, _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); key_free(client_key);

8
auth2.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #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> #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, host_status = check_key_in_hostfiles(pw, key, lookup,
_PATH_SSH_SYSTEM_HOSTFILE, _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. */ /* backward compat if no key has been found. */
if (host_status == HOST_NEW) if (host_status == HOST_NEW)
host_status = check_key_in_hostfiles(pw, key, lookup, host_status = check_key_in_hostfiles(pw, key, lookup,
_PATH_SSH_SYSTEM_HOSTFILE2, _PATH_SSH_SYSTEM_HOSTFILE2,
options.ignore_user_known_hosts ? _PATH_SSH_USER_HOSTFILE2 : options.ignore_user_known_hosts ? NULL :
NULL); _PATH_SSH_USER_HOSTFILE2);
return (host_status == HOST_OK); return (host_status == HOST_OK);
} }