2 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f1e24791c..4d3d2b788 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,9 @@
      show the key type that we are offering in debug(), helps distinguish
      between certs and plain keys as the path to the private key is usually
      the same.
+   - djm@cvs.openbsd.org 2010/04/10 05:48:16
+     [mux.c]
+     fix NULL dereference; from matthew.haub AT alumni.adelaide.edu.au
 
 20100410
  - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo
diff --git a/mux.c b/mux.c
index 825fb7a9a..b0d4abe19 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.14 2010/01/30 02:54:53 djm Exp $ */
+/* $OpenBSD: mux.c,v 1.15 2010/04/10 05:48:16 djm Exp $ */
 /*
  * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
  *
@@ -206,7 +206,7 @@ mux_master_control_cleanup_cb(int cid, void *unused)
                 fatal("%s: channel_by_id(%i) == NULL", __func__, cid);
         if (c->remote_id != -1) {
                 if ((sc = channel_by_id(c->remote_id)) == NULL)
-                        debug2("%s: channel %d n session channel %d",
+                        fatal("%s: channel %d missing session channel %d",
                             __func__, c->self, c->remote_id);
                 c->remote_id = -1;
                 sc->ctl_chan = -1;