summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/auth-rh-rsa.c
diff options
context:
space:
mode:
authorgreen <green@FreeBSD.org>2000-12-05 02:55:12 +0000
committergreen <green@FreeBSD.org>2000-12-05 02:55:12 +0000
commitab6b35a1d6b61fa8d2bb7336a0ef6fa9378898ef (patch)
treeccefbd34ee9fea2be5de1744eb036cb66156f5bd /crypto/openssh/auth-rh-rsa.c
parent6202ac16142a68bfbc9a54bc13190fafeefe1f5c (diff)
downloadFreeBSD-src-ab6b35a1d6b61fa8d2bb7336a0ef6fa9378898ef.zip
FreeBSD-src-ab6b35a1d6b61fa8d2bb7336a0ef6fa9378898ef.tar.gz
Update to OpenSSH 2.3.0 with FreeBSD modifications. OpenSSH 2.3.0
new features description elided in favor of checking out their website. Important new FreeBSD-version stuff: PAM support has been worked in, partially from the "Unix" OpenSSH version, and a lot due to the work of Eivind Eklend, too. This requires at least the following in pam.conf: sshd auth sufficient pam_skey.so sshd auth required pam_unix.so try_first_pass sshd session required pam_permit.so Parts by: Eivind Eklend <eivind@FreeBSD.org>
Diffstat (limited to 'crypto/openssh/auth-rh-rsa.c')
-rw-r--r--crypto/openssh/auth-rh-rsa.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/auth-rh-rsa.c b/crypto/openssh/auth-rh-rsa.c
index 2297b42..a9dd117 100644
--- a/crypto/openssh/auth-rh-rsa.c
+++ b/crypto/openssh/auth-rh-rsa.c
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: auth-rh-rsa.c,v 1.16 2000/09/07 21:13:36 markus Exp $");
+RCSID("$OpenBSD: auth-rh-rsa.c,v 1.17 2000/10/03 18:03:03 markus Exp $");
RCSID("$FreeBSD$");
#include "packet.h"
@@ -40,9 +40,9 @@ auth_rhosts_rsa(struct passwd *pw, const char *client_user, RSA *client_host_key
HostStatus host_status;
Key *client_key, *found;
- debug("Trying rhosts with RSA host authentication for %.100s", client_user);
+ debug("Trying rhosts with RSA host authentication for client user %.100s", client_user);
- if (client_host_key == NULL)
+ if (pw == NULL || client_host_key == NULL)
return 0;
/* Check if we would accept it using rhosts authentication. */
OpenPOWER on IntegriCloud