summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--monitor.c8
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 941843a73..bf2ca3620 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120050306
2 - (dtucker) [monitor.c] Bug #125 comment #47: fix errors returned by monitor
3 when attempting to audit disconnect events. Reported by Phil Dibowitz.
4
120050305 520050305
2 - (djm) [contrib/cygwin/README] Improve Cygwin build documentation. Patch 6 - (djm) [contrib/cygwin/README] Improve Cygwin build documentation. Patch
3 from vinschen at redhat.com 7 from vinschen at redhat.com
@@ -2277,4 +2281,4 @@
2277 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2281 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2278 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2282 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2279 2283
2280$Id: ChangeLog,v 1.3691 2005/03/05 00:22:50 djm Exp $ 2284$Id: ChangeLog,v 1.3692 2005/03/06 11:31:35 dtucker Exp $
diff --git a/monitor.c b/monitor.c
index a94e2cd28..301e150b3 100644
--- a/monitor.c
+++ b/monitor.c
@@ -192,7 +192,7 @@ struct mon_table mon_dispatch_proto20[] = {
192 {MONITOR_REQ_PAM_FREE_CTX, MON_ONCE|MON_AUTHDECIDE, mm_answer_pam_free_ctx}, 192 {MONITOR_REQ_PAM_FREE_CTX, MON_ONCE|MON_AUTHDECIDE, mm_answer_pam_free_ctx},
193#endif 193#endif
194#ifdef SSH_AUDIT_EVENTS 194#ifdef SSH_AUDIT_EVENTS
195 {MONITOR_REQ_AUDIT_EVENT, 0, mm_answer_audit_event}, 195 {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event},
196#endif 196#endif
197#ifdef BSD_AUTH 197#ifdef BSD_AUTH
198 {MONITOR_REQ_BSDAUTHQUERY, MON_ISAUTH, mm_answer_bsdauthquery}, 198 {MONITOR_REQ_BSDAUTHQUERY, MON_ISAUTH, mm_answer_bsdauthquery},
@@ -252,7 +252,7 @@ struct mon_table mon_dispatch_proto15[] = {
252 {MONITOR_REQ_PAM_FREE_CTX, MON_ONCE|MON_AUTHDECIDE, mm_answer_pam_free_ctx}, 252 {MONITOR_REQ_PAM_FREE_CTX, MON_ONCE|MON_AUTHDECIDE, mm_answer_pam_free_ctx},
253#endif 253#endif
254#ifdef SSH_AUDIT_EVENTS 254#ifdef SSH_AUDIT_EVENTS
255 {MONITOR_REQ_AUDIT_EVENT, 0, mm_answer_audit_event}, 255 {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event},
256#endif 256#endif
257 {0, 0, NULL} 257 {0, 0, NULL}
258}; 258};
@@ -263,7 +263,7 @@ struct mon_table mon_dispatch_postauth15[] = {
263 {MONITOR_REQ_TERM, 0, mm_answer_term}, 263 {MONITOR_REQ_TERM, 0, mm_answer_term},
264#ifdef SSH_AUDIT_EVENTS 264#ifdef SSH_AUDIT_EVENTS
265 {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, 265 {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event},
266 {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT|MON_ONCE, mm_answer_audit_command}, 266 {MONITOR_REQ_AUDIT_COMMAND, MON_ONCE, mm_answer_audit_command},
267#endif 267#endif
268 {0, 0, NULL} 268 {0, 0, NULL}
269}; 269};
@@ -629,7 +629,7 @@ mm_answer_pwnamallow(int sock, Buffer *m)
629 monitor_permit(mon_dispatch, MONITOR_REQ_PAM_START, 1); 629 monitor_permit(mon_dispatch, MONITOR_REQ_PAM_START, 1);
630#endif 630#endif
631#ifdef SSH_AUDIT_EVENTS 631#ifdef SSH_AUDIT_EVENTS
632 monitor_permit(mon_dispatch, MONITOR_REQ_AUDIT_EVENT, 1); 632 monitor_permit(mon_dispatch, MONITOR_REQ_AUDIT_COMMAND, 1);
633#endif 633#endif
634 634
635 return (0); 635 return (0);