3 files changed, 7 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index bf2ca3620..a96605e9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20050306
  - (dtucker) [monitor.c] Bug #125 comment #47: fix errors returned by monitor
    when attempting to audit disconnect events.  Reported by Phil Dibowitz.
+ - (dtucker) [session.c sshd.c] Bug #125 comment #49: Send disconnect audit
+   events earlier, prevents mm_request_send errors reported by Matt Goebel.
 
 20050305
  - (djm) [contrib/cygwin/README] Improve Cygwin build documentation. Patch 
@@ -2281,4 +2283,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3692 2005/03/06 11:31:35 dtucker Exp $
+$Id: ChangeLog,v 1.3693 2005/03/06 11:38:51 dtucker Exp $
diff --git a/session.c b/session.c
index df7552334..b32c9e2ca 100644
--- a/session.c
+++ b/session.c
@@ -2344,10 +2344,6 @@ do_cleanup(Authctxt *authctxt)
         }
 #endif
 
-#ifdef SSH_AUDIT_EVENTS
-        PRIVSEP(audit_event(SSH_CONNECTION_CLOSE));
-#endif
-
         /* remove agent socket */
         auth_sock_cleanup_proc(authctxt->pw);
 
diff --git a/sshd.c b/sshd.c
index a5b7f1ca3..11d618d11 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1728,6 +1728,10 @@ main(int ac, char **av)
                 finish_pam();
 #endif /* USE_PAM */
 
+#ifdef SSH_AUDIT_EVENTS
+        PRIVSEP(audit_event(SSH_CONNECTION_CLOSE));
+#endif
+
         packet_close();
 
         if (use_privsep)