summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/monitor.c b/monitor.c
index 04534d759..d6df656b0 100644
--- a/monitor.c
+++ b/monitor.c
@@ -143,7 +143,7 @@ int mm_answer_gss_userok(int, Buffer *);
143int mm_answer_gss_checkmic(int, Buffer *); 143int mm_answer_gss_checkmic(int, Buffer *);
144#endif 144#endif
145 145
146#ifdef AUDIT_EVENTS 146#ifdef SSH_AUDIT_EVENTS
147int mm_answer_audit_event(int, Buffer *); 147int mm_answer_audit_event(int, Buffer *);
148int mm_answer_audit_command(int, Buffer *); 148int mm_answer_audit_command(int, Buffer *);
149#endif 149#endif
@@ -191,7 +191,7 @@ struct mon_table mon_dispatch_proto20[] = {
191 {MONITOR_REQ_PAM_RESPOND, MON_ISAUTH, mm_answer_pam_respond}, 191 {MONITOR_REQ_PAM_RESPOND, MON_ISAUTH, mm_answer_pam_respond},
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 AUDIT_EVENTS 194#ifdef SSH_AUDIT_EVENTS
195 {MONITOR_REQ_AUDIT_EVENT, 0, mm_answer_audit_event}, 195 {MONITOR_REQ_AUDIT_EVENT, 0, mm_answer_audit_event},
196#endif 196#endif
197#ifdef BSD_AUTH 197#ifdef BSD_AUTH
@@ -219,7 +219,7 @@ struct mon_table mon_dispatch_postauth20[] = {
219 {MONITOR_REQ_PTY, 0, mm_answer_pty}, 219 {MONITOR_REQ_PTY, 0, mm_answer_pty},
220 {MONITOR_REQ_PTYCLEANUP, 0, mm_answer_pty_cleanup}, 220 {MONITOR_REQ_PTYCLEANUP, 0, mm_answer_pty_cleanup},
221 {MONITOR_REQ_TERM, 0, mm_answer_term}, 221 {MONITOR_REQ_TERM, 0, mm_answer_term},
222#ifdef AUDIT_EVENTS 222#ifdef SSH_AUDIT_EVENTS
223 {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, 223 {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event},
224 {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT, mm_answer_audit_command}, 224 {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT, mm_answer_audit_command},
225#endif 225#endif
@@ -251,7 +251,7 @@ struct mon_table mon_dispatch_proto15[] = {
251 {MONITOR_REQ_PAM_RESPOND, MON_ISAUTH, mm_answer_pam_respond}, 251 {MONITOR_REQ_PAM_RESPOND, MON_ISAUTH, mm_answer_pam_respond},
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 AUDIT_EVENTS 254#ifdef SSH_AUDIT_EVENTS
255 {MONITOR_REQ_AUDIT_EVENT, 0, mm_answer_audit_event}, 255 {MONITOR_REQ_AUDIT_EVENT, 0, mm_answer_audit_event},
256#endif 256#endif
257 {0, 0, NULL} 257 {0, 0, NULL}
@@ -261,7 +261,7 @@ struct mon_table mon_dispatch_postauth15[] = {
261 {MONITOR_REQ_PTY, MON_ONCE, mm_answer_pty}, 261 {MONITOR_REQ_PTY, MON_ONCE, mm_answer_pty},
262 {MONITOR_REQ_PTYCLEANUP, MON_ONCE, mm_answer_pty_cleanup}, 262 {MONITOR_REQ_PTYCLEANUP, MON_ONCE, mm_answer_pty_cleanup},
263 {MONITOR_REQ_TERM, 0, mm_answer_term}, 263 {MONITOR_REQ_TERM, 0, mm_answer_term},
264#ifdef 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_PERMIT|MON_ONCE, mm_answer_audit_command},
267#endif 267#endif
@@ -628,7 +628,7 @@ mm_answer_pwnamallow(int sock, Buffer *m)
628 if (options.use_pam) 628 if (options.use_pam)
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 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_EVENT, 1);
633#endif 633#endif
634 634
@@ -1513,7 +1513,7 @@ mm_answer_term(int sock, Buffer *req)
1513 exit(res); 1513 exit(res);
1514} 1514}
1515 1515
1516#ifdef AUDIT_EVENTS 1516#ifdef SSH_AUDIT_EVENTS
1517/* Report that an audit event occurred */ 1517/* Report that an audit event occurred */
1518int 1518int
1519mm_answer_audit_event(int socket, Buffer *m) 1519mm_answer_audit_event(int socket, Buffer *m)
@@ -1525,13 +1525,13 @@ mm_answer_audit_event(int socket, Buffer *m)
1525 event = buffer_get_int(m); 1525 event = buffer_get_int(m);
1526 buffer_free(m); 1526 buffer_free(m);
1527 switch(event) { 1527 switch(event) {
1528 case AUTH_FAIL_PUBKEY: 1528 case SSH_AUTH_FAIL_PUBKEY:
1529 case AUTH_FAIL_HOSTBASED: 1529 case SSH_AUTH_FAIL_HOSTBASED:
1530 case AUTH_FAIL_GSSAPI: 1530 case SSH_AUTH_FAIL_GSSAPI:
1531 case LOGIN_EXCEED_MAXTRIES: 1531 case SSH_LOGIN_EXCEED_MAXTRIES:
1532 case LOGIN_ROOT_DENIED: 1532 case SSH_LOGIN_ROOT_DENIED:
1533 case CONNECTION_CLOSE: 1533 case SSH_CONNECTION_CLOSE:
1534 case INVALID_USER: 1534 case SSH_INVALID_USER:
1535 audit_event(event); 1535 audit_event(event);
1536 break; 1536 break;
1537 default: 1537 default:
@@ -1555,7 +1555,7 @@ mm_answer_audit_command(int socket, Buffer *m)
1555 buffer_free(m); 1555 buffer_free(m);
1556 return (0); 1556 return (0);
1557} 1557}
1558#endif /* AUDIT_EVENTS */ 1558#endif /* SSH_AUDIT_EVENTS */
1559 1559
1560void 1560void
1561monitor_apply_keystate(struct monitor *pmonitor) 1561monitor_apply_keystate(struct monitor *pmonitor)