diff options
| author | green <green@FreeBSD.org> | 2000-12-05 02:55:12 +0000 |
|---|---|---|
| committer | green <green@FreeBSD.org> | 2000-12-05 02:55:12 +0000 |
| commit | ab6b35a1d6b61fa8d2bb7336a0ef6fa9378898ef (patch) | |
| tree | ccefbd34ee9fea2be5de1744eb036cb66156f5bd /crypto/openssh/auth-passwd.c | |
| parent | 6202ac16142a68bfbc9a54bc13190fafeefe1f5c (diff) | |
| download | FreeBSD-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-passwd.c')
| -rw-r--r-- | crypto/openssh/auth-passwd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/auth-passwd.c b/crypto/openssh/auth-passwd.c index 934b6e3..c579af3 100644 --- a/crypto/openssh/auth-passwd.c +++ b/crypto/openssh/auth-passwd.c @@ -59,7 +59,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-passwd.c,v 1.17 2000/09/07 20:27:49 deraadt Exp $"); +RCSID("$OpenBSD: auth-passwd.c,v 1.18 2000/10/03 18:03:03 markus Exp $"); RCSID("$FreeBSD$"); #include "packet.h" @@ -85,7 +85,7 @@ auth_password(struct passwd * pw, const char *password) if (*password == '\0' && options.permit_empty_passwd == 0) return 0; -#ifdef SKEY +#ifdef SKEY_VIA_PASSWD_IS_DISABLED if (options.skey_authentication == 1) { int ret = auth_skey_password(pw, password); if (ret == 1 || ret == 0) |
