summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--monitor.c5
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 @@
9 - (dtucker) [auth-pam.c] Propogate TZ environment variable to PAM auth 9 - (dtucker) [auth-pam.c] Propogate TZ environment variable to PAM auth
10 process so that any logging it does is with the right timezone. From 10 process so that any logging it does is with the right timezone. From
11 Scott Strickler, ok djm@. 11 Scott Strickler, ok djm@.
12 - (dtucker) [monitor.c] Correctly handle auditing of single commands when
13 using Protocol 1. From jhb at freebsd.
12 14
1320060912 1520060912
14 - (djm) [Makefile.in buildpkg.sh.in configure.ac openssh.xml.in] 16 - (djm) [Makefile.in buildpkg.sh.in configure.ac openssh.xml.in]
@@ -5445,4 +5447,4 @@
5445 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5447 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5446 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5448 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5447 5449
5448$Id: ChangeLog,v 1.4547 2006/09/17 01:57:46 dtucker Exp $ 5450$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[] = {
286 {MONITOR_REQ_TERM, 0, mm_answer_term}, 286 {MONITOR_REQ_TERM, 0, mm_answer_term},
287#ifdef SSH_AUDIT_EVENTS 287#ifdef SSH_AUDIT_EVENTS
288 {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, 288 {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event},
289 {MONITOR_REQ_AUDIT_COMMAND, MON_ONCE, mm_answer_audit_command}, 289 {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT|MON_ONCE, mm_answer_audit_command},
290#endif 290#endif
291 {0, 0, NULL} 291 {0, 0, NULL}
292}; 292};
@@ -660,9 +660,6 @@ mm_answer_pwnamallow(int sock, Buffer *m)
660 if (options.use_pam) 660 if (options.use_pam)
661 monitor_permit(mon_dispatch, MONITOR_REQ_PAM_START, 1); 661 monitor_permit(mon_dispatch, MONITOR_REQ_PAM_START, 1);
662#endif 662#endif
663#ifdef SSH_AUDIT_EVENTS
664 monitor_permit(mon_dispatch, MONITOR_REQ_AUDIT_COMMAND, 1);
665#endif
666 663
667 return (0); 664 return (0);
668} 665}