From bb09a477c28ff68a8794b02669f368ca101bf4a6 Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Sun, 17 Sep 2006 02:00:13 +0000
Subject: [PATCH]  - (dtucker) [monitor.c] Correctly handle auditing of single
 commands when    using Protocol 1.  From jhb at freebsd.

---
 ChangeLog | 2 ++
 monitor.c | 5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bd47ad48..7dc04572 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]
diff --git a/monitor.c b/monitor.c
index 364bd231..b20d0c72 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);
 }
-- 
2.45.2