2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e69d0ae72..14a146dd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,10 @@
      [ssh.1]
      satisfy the pedants: -q does not suppress all diagnostic messages (e.g.
      some commandline parsing warnings go unconditionally to stdout).
+   - djm@cvs.openbsd.org 2008/01/19 20:48:53
+     [clientloop.c]
+     fd leak on session multiplexing error path. Report and patch from
+     gregory_shively AT fanniemae.com
 
 20080119
  - (djm) Silence noice from expr in ssh-copy-id; patch from
@@ -3538,4 +3542,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4821 2008/02/10 11:21:28 djm Exp $
+$Id: ChangeLog,v 1.4822 2008/02/10 11:22:53 djm Exp $
diff --git a/clientloop.c b/clientloop.c
index 109df4cac..195615063 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.185 2007/12/28 22:34:47 dtucker Exp $ */
+/* $OpenBSD: clientloop.c,v 1.186 2008/01/19 20:48:53 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -888,6 +888,7 @@ client_process_control(fd_set *readset)
                                 xfree(cctx->env);
                         xfree(cctx->term);
                         buffer_free(&cctx->cmd);
+                        close(client_fd);
                         xfree(cctx);
                         return;
                 }