merge 6.0p1

1 files changed, 2 insertions, 1 deletions

diff --git a/clientloop.h b/clientloop.h
index a259b5e14..3bb794879 100644
--- a/clientloop.h
+++ b/clientloop.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.h,v 1.28 2011/06/22 22:08:42 djm Exp $ */
+/* $OpenBSD: clientloop.h,v 1.29 2011/09/09 22:46:44 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -70,6 +70,7 @@ void client_expect_confirm(int, const char *, enum confirm_action);
 #define SSHMUX_COMMAND_STDIO_FWD        4       /* Open stdio fwd (ssh -W) */
 #define SSHMUX_COMMAND_FORWARD          5       /* Forward only, no command */
 #define SSHMUX_COMMAND_STOP             6       /* Disable mux but not conn */
+#define SSHMUX_COMMAND_CANCEL_FWD       7       /* Cancel forwarding(s) */
 
 void    muxserver_listen(void);
 void    muxclient(const char *);