summaryrefslogtreecommitdiffstats
path: root/x11vnc/user.c
diff options
context:
space:
mode:
authorrunge <runge>2007-10-27 22:45:30 +0000
committerrunge <runge>2007-10-27 22:45:30 +0000
commit81ef0b9345dd393fea8edab879ee1fd8f0bf9e81 (patch)
tree6866c2f68f25a00cbfb4f636282fd9cf52bf4a37 /x11vnc/user.c
parentbe9dc49025c3588e6b01051263ca410769174ea4 (diff)
downloadlibtdevnc-81ef0b9345dd393fea8edab879ee1fd8f0bf9e81.tar.gz
libtdevnc-81ef0b9345dd393fea8edab879ee1fd8f0bf9e81.zip
x11vnc: -proxy, -ssh options. ncache bug in -8to24, Selection "targets" bugfix.
Diffstat (limited to 'x11vnc/user.c')
-rw-r--r--x11vnc/user.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/x11vnc/user.c b/x11vnc/user.c
index 91f1840..717772d 100644
--- a/x11vnc/user.c
+++ b/x11vnc/user.c
@@ -1314,6 +1314,7 @@ void user_supplied_opts(char *opts) {
static void vnc_redirect_timeout (int sig) {
write(2, "timeout: no clients connected.\n", 31);
+ if (sig) {};
exit(0);
}
@@ -1513,6 +1514,10 @@ int wait_for_client(int *argc, char** argv, int http) {
initialize_signals();
+ if (ssh_str != NULL) {
+ ssh_remote_tunnel(ssh_str, screen->port);
+ }
+
if (! raw_fb) {
chg_raw_fb = 1;
/* kludge to get RAWFB_RET with dpy == NULL guards */
@@ -1600,7 +1605,6 @@ int wait_for_client(int *argc, char** argv, int http) {
accept_openssl(OPENSSL_INETD, -1);
}
} else {
- int gotone = 0;
if (first_conn_timeout) {
if (first_conn_timeout < 0) {
first_conn_timeout = -first_conn_timeout;