diff options
| author | Damien Miller <djm@mindrot.org> | 1999-11-18 09:28:11 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 1999-11-18 09:28:11 +1100 |
| commit | 81428f9d10e81d9fe2e4af10df0c4e38d1192d70 (patch) | |
| tree | b19982baa6558d387f3537ef67d64a5f6a38ebd0 /sshd.c | |
| parent | 10f6f6ba9ee14d306f8780edee8a10640c1643e0 (diff) | |
- Merged OpenBSD CVS changes
- [scp.c] foregroundproc() in scp
- [sshconnect.h] include fingerprint.h
- [sshd.c] bugfix: the log() for passwd-auth escaped during logging
changes.
- Added openssh.com info to README
Diffstat (limited to 'sshd.c')
| -rw-r--r-- | sshd.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -18,7 +18,7 @@ agent connections. */ #include "includes.h" -RCSID("$Id: sshd.c,v 1.22 1999/11/17 06:29:08 damien Exp $"); +RCSID("$Id: sshd.c,v 1.23 1999/11/17 22:28:11 damien Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -1422,11 +1422,12 @@ do_authloop(struct passwd *pw) n = BN_new(); packet_get_bignum(n, &nlen); packet_integrity_check(plen, nlen, type); + authenticated = auth_rsa(pw, n); - BN_clear_free(n); log("RSA authentication %s for %.100s.", authenticated ? "accepted" : "failed", pw->pw_name); + BN_clear_free(n); break; case SSH_CMSG_AUTH_PASSWORD: @@ -1459,6 +1460,9 @@ do_authloop(struct passwd *pw) #else /* HAVE_LIBPAM */ /* Try authentication with the password. */ authenticated = auth_password(pw, password); + log("Password authentication %s for %.100s.", + authenticated ? "accepted" : "failed", + pw->pw_name); memset(password, 0, strlen(password)); xfree(password); |