summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-04-03 12:44:23 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-04-03 12:44:23 +1000
commit69152291e7dd83db673a85aba6a6f8d265f1871b (patch)
tree82741472351b67bb48a606cd877234cf9ce63f98
parent4942de57199424734567879dacad61c00e96ffab (diff)
- (dtucker) [monitor.c] Don't free buffers in audit functions, monitor_read
will free as needed. ok tim@ djm@
-rw-r--r--ChangeLog4
-rw-r--r--monitor.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 40b5c8b6c..185306576 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
7 [scp.c] 7 [scp.c]
8 since ssh has xstrdup, use it instead of strdup+test. unbreaks -Werror 8 since ssh has xstrdup, use it instead of strdup+test. unbreaks -Werror
9 build 9 build
10 - (dtucker) [monitor.c] Don't free buffers in audit functions, monitor_read
11 will free as needed. ok tim@ djm@
10 12
1120050331 1320050331
12 - (dtucker) OpenBSD CVS Sync 14 - (dtucker) OpenBSD CVS Sync
@@ -2418,4 +2420,4 @@
2418 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2420 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2419 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2421 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2420 2422
2421$Id: ChangeLog,v 1.3736 2005/04/03 00:16:39 djm Exp $ 2423$Id: ChangeLog,v 1.3737 2005/04/03 02:44:23 dtucker Exp $
diff --git a/monitor.c b/monitor.c
index c6a42e709..9dca9c803 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1525,7 +1525,6 @@ mm_answer_audit_event(int socket, Buffer *m)
1525 debug3("%s entering", __func__); 1525 debug3("%s entering", __func__);
1526 1526
1527 event = buffer_get_int(m); 1527 event = buffer_get_int(m);
1528 buffer_free(m);
1529 switch(event) { 1528 switch(event) {
1530 case SSH_AUTH_FAIL_PUBKEY: 1529 case SSH_AUTH_FAIL_PUBKEY:
1531 case SSH_AUTH_FAIL_HOSTBASED: 1530 case SSH_AUTH_FAIL_HOSTBASED:
@@ -1554,7 +1553,6 @@ mm_answer_audit_command(int socket, Buffer *m)
1554 /* sanity check command, if so how? */ 1553 /* sanity check command, if so how? */
1555 audit_run_command(cmd); 1554 audit_run_command(cmd);
1556 xfree(cmd); 1555 xfree(cmd);
1557 buffer_free(m);
1558 return (0); 1556 return (0);
1559} 1557}
1560#endif /* SSH_AUDIT_EVENTS */ 1558#endif /* SSH_AUDIT_EVENTS */