1 files changed, 16 insertions, 0 deletions

diff --git a/session.c b/session.c
index 4d7ac9de7..b645144c5 100644
--- a/session.c
+++ b/session.c
@@ -665,6 +665,18 @@ do_exec(Session *s, const char *command)
                 debug("Forced command '%.900s'", command);
         }
 
+#ifdef AUDIT_EVENTS
+        if (command != NULL)
+                PRIVSEP(audit_run_command(command));
+        else if (s->ttyfd == -1) {
+                char *shell = s->pw->pw_shell;
+
+                if (shell[0] == '\0')   /* empty shell means /bin/sh */
+                        shell =_PATH_BSHELL;
+                PRIVSEP(audit_run_command(shell));
+        }
+#endif
+
 #ifdef GSSAPI
         if (options.gss_authentication) {
                 temporarily_use_uid(s->pw);
@@ -2321,6 +2333,10 @@ do_cleanup(Authctxt *authctxt)
         }
 #endif
 
+#ifdef AUDIT_EVENTS
+        PRIVSEP(audit_event(CONNECTION_CLOSE));
+#endif
+
         /* remove agent socket */
         auth_sock_cleanup_proc(authctxt->pw);