diff options
| author | runge <runge> | 2006-08-02 16:18:23 +0000 |
|---|---|---|
| committer | runge <runge> | 2006-08-02 16:18:23 +0000 |
| commit | 268359a66e684d738e1526df2d38a83fa6781092 (patch) | |
| tree | 9bbe5c69bf5f5ad61b62b796714b1824977b65ad /classes/ssl | |
| parent | 34c62cfd79c6dbb3d7c87ebcf358ad6f42bdb31e (diff) | |
| download | libtdevnc-268359a66e684d738e1526df2d38a83fa6781092.tar.gz libtdevnc-268359a66e684d738e1526df2d38a83fa6781092.zip | |
x11vnc: tweaks to ssl_xfer; -ssltimeout option.
Diffstat (limited to 'classes/ssl')
| -rwxr-xr-x | classes/ssl/ssl_vncviewer | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/classes/ssl/ssl_vncviewer b/classes/ssl/ssl_vncviewer index 96ad36d..1dec89f 100755 --- a/classes/ssl/ssl_vncviewer +++ b/classes/ssl/ssl_vncviewer @@ -220,6 +220,7 @@ if [ "X$use_ssh" = "X1" ]; then echo "" echo "Running ssh:" echo "$ssh -f -p $ssh_port -L ${use}:${vnc_host}:${port} $ssh_host \"$ssh_cmd\"" + echo "" $ssh -f -p $ssh_port -L ${use}:${vnc_host}:${port} $ssh_host "$ssh_cmd" if [ "$?" != "0" ]; then echo "" @@ -236,6 +237,7 @@ if [ "X$use_ssh" = "X1" ]; then echo "" echo "Running viewer:" echo $VNCVIEWERCMD "$@" localhost:$N + echo "" $VNCVIEWERCMD "$@" localhost:$N exit $? @@ -420,11 +422,12 @@ foreground = yes pid = client = yes debug = 6 +$STUNNEL_EXTRA_OPTS $verify $cert [vnc_stunnel] -accept = $use +accept = localhost:$use $connect END @@ -436,7 +439,8 @@ echo "" sleep 1 echo "" -echo "Running: $STUNNEL $tmp" +echo "Running: stunnel" +echo "$STUNNEL $tmp" $STUNNEL "$tmp" < /dev/tty > /dev/tty & pid=$! echo "" @@ -452,6 +456,7 @@ rm -f "$tmp" echo "" echo "Running viewer:" echo $VNCVIEWERCMD "$@" localhost:$N +echo "" $VNCVIEWERCMD "$@" localhost:$N kill $pid |