diff options
author | Damien Miller <djm@mindrot.org> | 2019-01-20 14:55:27 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-20 14:55:27 +1100 |
commit | 9b655dc9c9a353f0a527f0c6c43a5e35653c9503 (patch) | |
tree | 78b3512ffa1a9e5b8d954aca6fb45a0a3045504b /sshd.c | |
parent | 3f0786bbe73609ac96e5a0d91425ee21129f8e04 (diff) |
last bits of old packet API / active_state global
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -2080,7 +2080,7 @@ main(int ac, char **av) } #ifdef SSH_AUDIT_EVENTS - audit_event(SSH_AUTH_SUCCESS); + audit_event(ssh, SSH_AUTH_SUCCESS); #endif #ifdef GSSAPI @@ -2128,7 +2128,7 @@ main(int ac, char **av) #endif /* USE_PAM */ #ifdef SSH_AUDIT_EVENTS - PRIVSEP(audit_event(SSH_CONNECTION_CLOSE)); + PRIVSEP(audit_event(ssh, SSH_CONNECTION_CLOSE)); #endif ssh_packet_close(ssh); @@ -2256,8 +2256,8 @@ cleanup_exit(int i) } #ifdef SSH_AUDIT_EVENTS /* done after do_cleanup so it can cancel the PAM auth 'thread' */ - if (!use_privsep || mm_is_monitor()) - audit_event(SSH_CONNECTION_ABANDON); + if (the_active_state != NULL && (!use_privsep || mm_is_monitor())) + audit_event(the_active_state, SSH_CONNECTION_ABANDON); #endif _exit(i); } |