- (dtucker) [monitor.c] Correctly handle auditing of single commands when

   using Protocol 1.  From jhb at freebsd.

2 files changed, 4 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 48de6b1c9..3af1ff35a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
  - (dtucker) [auth-pam.c] Propogate TZ environment variable to PAM auth
    process so that any logging it does is with the right timezone.  From
    Scott Strickler, ok djm@.
+ - (dtucker) [monitor.c] Correctly handle auditing of single commands when
+   using Protocol 1.  From jhb at freebsd.
 
 20060912
  - (djm) [Makefile.in buildpkg.sh.in configure.ac openssh.xml.in]
@@ -5445,4 +5447,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4547 2006/09/17 01:57:46 dtucker Exp $
+$Id: ChangeLog,v 1.4548 2006/09/17 02:00:13 dtucker Exp $
diff --git a/monitor.c b/monitor.c
index 364bd2316..b20d0c726 100644
--- a/monitor.c
+++ b/monitor.c
@@ -286,7 +286,7 @@ struct mon_table mon_dispatch_postauth15[] = {
     {MONITOR_REQ_TERM, 0, mm_answer_term},
 #ifdef SSH_AUDIT_EVENTS
     {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event},
-    {MONITOR_REQ_AUDIT_COMMAND, MON_ONCE, mm_answer_audit_command},
+    {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT|MON_ONCE, mm_answer_audit_command},
 #endif
     {0, 0, NULL}
 };
@@ -660,9 +660,6 @@ mm_answer_pwnamallow(int sock, Buffer *m)
 	if (options.use_pam)
 		monitor_permit(mon_dispatch, MONITOR_REQ_PAM_START, 1);
 #endif
-#ifdef SSH_AUDIT_EVENTS
-	monitor_permit(mon_dispatch, MONITOR_REQ_AUDIT_COMMAND, 1);
-#endif
 
 	return (0);
 }