summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/monitor.c b/monitor.c
index 301e150b3..9dca9c803 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: monitor.c,v 1.62 2005/01/30 11:18:08 dtucker Exp $"); 28RCSID("$OpenBSD: monitor.c,v 1.63 2005/03/10 22:01:05 deraadt Exp $");
29 29
30#include <openssl/dh.h> 30#include <openssl/dh.h>
31 31
@@ -310,6 +310,8 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
310 authctxt = _authctxt; 310 authctxt = _authctxt;
311 memset(authctxt, 0, sizeof(*authctxt)); 311 memset(authctxt, 0, sizeof(*authctxt));
312 312
313 authctxt->loginmsg = &loginmsg;
314
313 if (compat20) { 315 if (compat20) {
314 mon_dispatch = mon_dispatch_proto20; 316 mon_dispatch = mon_dispatch_proto20;
315 317
@@ -976,7 +978,7 @@ mm_answer_keyallowed(int sock, Buffer *m)
976 debug3("%s: key_from_blob: %p", __func__, key); 978 debug3("%s: key_from_blob: %p", __func__, key);
977 979
978 if (key != NULL && authctxt->valid) { 980 if (key != NULL && authctxt->valid) {
979 switch(type) { 981 switch (type) {
980 case MM_USERKEY: 982 case MM_USERKEY:
981 allowed = options.pubkey_authentication && 983 allowed = options.pubkey_authentication &&
982 user_key_allowed(authctxt->pw, key); 984 user_key_allowed(authctxt->pw, key);
@@ -1523,7 +1525,6 @@ mm_answer_audit_event(int socket, Buffer *m)
1523 debug3("%s entering", __func__); 1525 debug3("%s entering", __func__);
1524 1526
1525 event = buffer_get_int(m); 1527 event = buffer_get_int(m);
1526 buffer_free(m);
1527 switch(event) { 1528 switch(event) {
1528 case SSH_AUTH_FAIL_PUBKEY: 1529 case SSH_AUTH_FAIL_PUBKEY:
1529 case SSH_AUTH_FAIL_HOSTBASED: 1530 case SSH_AUTH_FAIL_HOSTBASED:
@@ -1552,7 +1553,6 @@ mm_answer_audit_command(int socket, Buffer *m)
1552 /* sanity check command, if so how? */ 1553 /* sanity check command, if so how? */
1553 audit_run_command(cmd); 1554 audit_run_command(cmd);
1554 xfree(cmd); 1555 xfree(cmd);
1555 buffer_free(m);
1556 return (0); 1556 return (0);
1557} 1557}
1558#endif /* SSH_AUDIT_EVENTS */ 1558#endif /* SSH_AUDIT_EVENTS */