summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>1999-11-17 09:51:22 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>1999-11-17 09:51:22 +0000
commitb6639a344f861fc02de4f69d66431f2c29a2defa (patch)
tree5075a72104700bdcefdfde5157c2048d5a64cfe3
parent7c9594d40780c478c54f95924c9cf2aea64d120f (diff)
bugfix: the log() for passwd-auth escaped during logging changes.
-rw-r--r--usr.bin/ssh/sshd.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 1dacc774847..8da874e97eb 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -18,7 +18,7 @@ agent connections.
*/
#include "includes.h"
-RCSID("$Id: sshd.c,v 1.56 1999/11/16 21:15:19 markus Exp $");
+RCSID("$Id: sshd.c,v 1.57 1999/11/17 09:51:21 markus Exp $");
#include "xmalloc.h"
#include "rsa.h"
@@ -1233,11 +1233,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:
@@ -1255,6 +1256,9 @@ do_authloop(struct passwd *pw)
/* 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);