summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-13 04:54:05 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-06-13 04:54:05 +1000
commitba69c7a987ea42b6e26ce512a483d6ba44e3df0c (patch)
tree043683ebd45ee381f6514214680edd0c8156134e
parente5d98290a6bff2352c47bb54b769a605f0794d5d (diff)
- djm@cvs.openbsd.org 2008/06/12 05:32:30
[mux.c] some more TODO for me
-rw-r--r--ChangeLog5
-rw-r--r--mux.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c2b9b37a1..b23311f6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -94,6 +94,9 @@
94 - djm@cvs.openbsd.org 2008/06/12 05:15:41 94 - djm@cvs.openbsd.org 2008/06/12 05:15:41
95 [PROTOCOL] 95 [PROTOCOL]
96 document tun@openssh.com forwarding method 96 document tun@openssh.com forwarding method
97 - djm@cvs.openbsd.org 2008/06/12 05:32:30
98 [mux.c]
99 some more TODO for me
97 100
9820080611 10120080611
99 - (djm) [channels.c configure.ac] 102 - (djm) [channels.c configure.ac]
@@ -4256,4 +4259,4 @@
4256 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4259 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4257 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4260 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4258 4261
4259$Id: ChangeLog,v 1.4981 2008/06/12 18:53:27 dtucker Exp $ 4262$Id: ChangeLog,v 1.4982 2008/06/12 18:54:05 dtucker Exp $
diff --git a/mux.c b/mux.c
index efc3840cb..f5e68f653 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mux.c,v 1.2 2008/06/12 03:40:52 djm Exp $ */ 1/* $OpenBSD: mux.c,v 1.3 2008/06/12 05:32:30 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 *
@@ -30,7 +30,10 @@
30 * 4. ExitOnForwardingFailure (after #3 obviously) 30 * 4. ExitOnForwardingFailure (after #3 obviously)
31 * 5. Maybe extension mechanisms for multi-X11/multi-agent forwarding 31 * 5. Maybe extension mechanisms for multi-X11/multi-agent forwarding
32 * 6. Document the mux mini-protocol somewhere. 32 * 6. Document the mux mini-protocol somewhere.
33 * 6. Support ~^Z in mux slaves. 33 * 7. Support ~^Z in mux slaves.
34 * 8. Inspect or control sessions in master.
35 * 9. If we ever support the "signal" channel request, send signals on
36 * sessions in master.
34 */ 37 */
35 38
36#include <sys/types.h> 39#include <sys/types.h>