disable multiplexing in the default SSH command for -via mode

(which automatically sets up port-forwards for VNC connections);
if you connect to an existing multiplexed connection you can't
create the port-forward.
This commit is contained in:
sthen 2011-04-27 22:07:08 +00:00
parent 03c29ef9ed
commit 6a2a5681ae
2 changed files with 17 additions and 1 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.22 2010/11/19 22:31:38 espie Exp $
# $OpenBSD: Makefile,v 1.23 2011/04/27 22:07:08 sthen Exp $
COMMENT-gui = enhanced TightVNC client GUI and wrappers
COMMENT-main = enhanced TightVNC client
V = 1.0.28
REVISION-main = 0
DISTNAME = ssvnc-$V.src
PKGNAME = ssvnc-$V

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-vnc_unixsrc_vncviewer_vncviewer_h,v 1.1 2011/04/27 22:07:09 sthen Exp $
--- vnc_unixsrc/vncviewer/vncviewer.h.orig Wed Apr 27 23:01:21 2011
+++ vnc_unixsrc/vncviewer/vncviewer.h Wed Apr 27 23:02:30 2011
@@ -67,9 +67,9 @@ extern int endianTest;
#define DEFAULT_SSH_CMD "/usr/bin/ssh"
#define DEFAULT_TUNNEL_CMD \
- (DEFAULT_SSH_CMD " -f -L %L:localhost:%R %H sleep 20")
+ (DEFAULT_SSH_CMD " -f -S none -L %L:localhost:%R %H sleep 20")
#define DEFAULT_VIA_CMD \
- (DEFAULT_SSH_CMD " -f -L %L:%H:%R %G sleep 20")
+ (DEFAULT_SSH_CMD " -f -S none -L %L:%H:%R %G sleep 20")
#define TVNC_SAMPOPT 4
enum {TVNC_1X=0, TVNC_4X, TVNC_2X, TVNC_GRAY};