diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2005-06-05 15:41:57 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2005-06-05 15:41:57 +0000 |
| commit | 4518870c7202d4098a97eae7a1d3820d84a4b0f4 (patch) | |
| tree | 08ccf47ce923e292d8f5057f36d34f042b7a5e6d /crypto/openssh/monitor.c | |
| parent | 5e8dbd04ef7b2df5ba3f8dc859ad6e472ce1c534 (diff) | |
| download | src-4518870c7202d4098a97eae7a1d3820d84a4b0f4.tar.gz src-4518870c7202d4098a97eae7a1d3820d84a4b0f4.zip | |
Notes
Diffstat (limited to 'crypto/openssh/monitor.c')
| -rw-r--r-- | crypto/openssh/monitor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssh/monitor.c b/crypto/openssh/monitor.c index 301e150b3a21..9dca9c8034c1 100644 --- a/crypto/openssh/monitor.c +++ b/crypto/openssh/monitor.c @@ -25,7 +25,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: monitor.c,v 1.62 2005/01/30 11:18:08 dtucker Exp $"); +RCSID("$OpenBSD: monitor.c,v 1.63 2005/03/10 22:01:05 deraadt Exp $"); #include <openssl/dh.h> @@ -310,6 +310,8 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor) authctxt = _authctxt; memset(authctxt, 0, sizeof(*authctxt)); + authctxt->loginmsg = &loginmsg; + if (compat20) { mon_dispatch = mon_dispatch_proto20; @@ -976,7 +978,7 @@ mm_answer_keyallowed(int sock, Buffer *m) debug3("%s: key_from_blob: %p", __func__, key); if (key != NULL && authctxt->valid) { - switch(type) { + switch (type) { case MM_USERKEY: allowed = options.pubkey_authentication && user_key_allowed(authctxt->pw, key); @@ -1523,7 +1525,6 @@ mm_answer_audit_event(int socket, Buffer *m) debug3("%s entering", __func__); event = buffer_get_int(m); - buffer_free(m); switch(event) { case SSH_AUTH_FAIL_PUBKEY: case SSH_AUTH_FAIL_HOSTBASED: @@ -1552,7 +1553,6 @@ mm_answer_audit_command(int socket, Buffer *m) /* sanity check command, if so how? */ audit_run_command(cmd); xfree(cmd); - buffer_free(m); return (0); } #endif /* SSH_AUDIT_EVENTS */ |