summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--mux.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 76c6e920f..419640c2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
12 > fix bz#1948: ssh -f doesn't fork for multiplexed connection. 12 > fix bz#1948: ssh -f doesn't fork for multiplexed connection.
13 > ok dtucker@ 13 > ok dtucker@
14 it interacts badly with ControlPersist 14 it interacts badly with ControlPersist
15 - djm@cvs.openbsd.org 2012/01/07 21:11:36
16 [mux.c]
17 fix double-free in new session handler
18 NB. Id sync only
15 19
1620120519 2020120519
17 - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch 21 - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct. Patch
diff --git a/mux.c b/mux.c
index 30b4f6f93..d90605eb4 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mux.c,v 1.33 2011/12/04 23:16:12 djm Exp $ */ 1/* $OpenBSD: mux.c,v 1.34 2012/01/07 21:11:36 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
4 * 4 *