summaryrefslogtreecommitdiffstats
path: root/x11vnc/connections.c
diff options
context:
space:
mode:
authorrunge <runge@karlrunge.com>2010-05-01 13:16:37 -0400
committerrunge <runge@karlrunge.com>2010-05-01 13:16:37 -0400
commit59c0ae40935114b9bbe6a966446587469fc5deae (patch)
tree5e45a4014aa801de98ff65b0e9eb6209232a467d /x11vnc/connections.c
parent8d79a63d3c8caca5d0db4827e072f7c773387afa (diff)
downloadlibtdevnc-59c0ae40935114b9bbe6a966446587469fc5deae.tar.gz
libtdevnc-59c0ae40935114b9bbe6a966446587469fc5deae.zip
x11vnc: X11VNC_DISABLE_SSL_CLIENT_MODE option to disable SSL
client role in reverse connections. Improvements to logging in ultravnc_repeater, ULTRAVNC_REPEATER_NO_RFB option. Increase SSL timeout and print message if 'repeater' mode is detected for reverse SSL connection. Fix RECORD scroll XCopyArea detection with recent gtk/gdk library; set X11VNC_SCROLL_MUST_EQUAL to disable. Limit logging of RECORD error messages.
Diffstat (limited to 'x11vnc/connections.c')
-rw-r--r--x11vnc/connections.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/x11vnc/connections.c b/x11vnc/connections.c
index c664377..246acae 100644
--- a/x11vnc/connections.c
+++ b/x11vnc/connections.c
@@ -2644,7 +2644,9 @@ static int do_reverse_connect(char *str_in) {
}
/* XXX use header */
#define OPENSSL_REVERSE 6
- openssl_init(1);
+ if (!getenv("X11VNC_DISABLE_SSL_CLIENT_MODE")) {
+ openssl_init(1);
+ }
if (first_conn_timeout > 0) {
set_alarm = 1;