java ingoreProxy, fix old libssl free_func problem

x11vnc/connections.c

@@ -1653,6 +1653,14 @@ static int do_reverse_connect(char *str) {
 		openssl_init(0);
 		return 1;
 	}
+	if (use_stunnel) {
+		if(strcmp(host, "localhost") && strcmp(host, "127.0.0.1")) {
+			if (!getenv("STUNNEL_DISABLE_LOCALHOST")) {
+				rfbLog("reverse_connect: error host not localhost in -stunnel mode.\n");
+				return 0;
+			}
+		}
+	}
 
 	if (unixpw) {
 		int is_localhost = 0, user_disabled = 0;
@@ -1674,23 +1682,6 @@ static int do_reverse_connect(char *str) {
 		}
 	}
 
-#if 0
-	if (inetd && unixpw) {
-		if(strcmp(host, "localhost") && strcmp(host, "127.0.0.1")) {
-			if (! getenv("UNIXPW_DISABLE_LOCALHOST")) {
-				rfbLog("reverse_connect: in -inetd only localhost\n");
-				rfbLog("connections allowed under -unixpw\n");
-				return 0;
-			}
-		}
-		if (! getenv("UNIXPW_DISABLE_SSL") && ! have_ssh_env()) {
-			rfbLog("reverse_connect: in -inetd stunnel/ssh\n");
-			rfbLog("required under -unixpw\n");
-			return 0;
-		}
-	}
-#endif
-
 	cl = rfbReverseConnection(screen, host, rport);
 	free(host);
 

x11vnc/help.c

@@ -864,6 +864,10 @@ void print_help(int mode) {
 "                       Where /.../x11vnc is the full path to x11vnc.\n"
 "                       It is used in the Apache SSL-portal example (see FAQ).\n"
 "\n"
+"                       In this mode you can set X11VNC_SKIP_DISPLAY to a comma\n"
+"                       separated list of displays (e.g. \":0,:1\") to ignore\n"
+"                       in the finding process.\n"
+"\n"
 "                       An interesting option is WAIT:cmd=FINDCREATEDISPLAY\n"
 "                       that is like FINDDISPLAY in that is uses the same method\n"
 "                       to find an existing display.  However, if it does not\n"
@@ -908,6 +912,11 @@ void print_help(int mode) {
 "                       X server running the X case may only work on Linux\n"
 "                       (see startx(1)).\n"
 "\n"
+"                       You can set the environment variable FD_GEOM (or\n"
+"                       X11VNC_CREATE_GEOM) to WxH or WxHxD to set the width\n"
+"                       and height and optionally the color depth of the\n"
+"                       created display.\n"
+"\n"
 "                       If you want the FINDCREATEDISPLAY session to contact an\n"
 "                       XDMCP login manager (xdm/gdm/kdm) on the same machine,\n"
 "                       then use \"Xvfb.xdmcp\" instead of \"Xvfb\", etc.\n"

x11vnc/sslhelper.c

@@ -55,6 +55,13 @@ char *find_openssl_bin(void) {badnews(); return NULL;}
 char *get_saved_pem(char *string, int create) {badnews(); return NULL;}
 #else
 
+/*
+ * This is because on older systems both zlib.h and ssl.h define
+ * 'free_func' nothing we do below (currently) induces an external
+ * dependency on 'free_func'.
+ */
+#define free_func my_jolly_little_free_func
+
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>

x11vnc/ssltools.h

@@ -766,6 +766,25 @@ char find_display[] =
 "do\n"
 "	d=`echo \"$p\" | sed -e 's/://' -e 's/\\..*$//'`\n"
 "	ok=\"\"\n"
+"	if [ \"X$X11VNC_SKIP_DISPLAY\" != \"X\" ]; then\n"
+"		mat=\"\"\n"
+"		for skip in `echo $X11VNC_SKIP_DISPLAY | tr ',' '\\n'`\n"
+"		do\n"
+"			if echo \"$skip\" | grep \"^:\" > /dev/null; then\n"
+"				:\n"
+"			else\n"
+"				skip=\":$skip\"\n"
+"			fi\n"
+"			if echo \"$skip\" | grep \":$d\\>\" > /dev/null; then\n"
+"				mat=1\n"
+"				break\n"
+"				\n"
+"			fi\n"
+"		done\n"
+"		if [ \"X$mat\" = \"X1\" ]; then\n"
+"			continue\n"
+"		fi\n"
+"	fi\n"
 "	xd=\"/tmp/.X11-unix/X$d\"\n"
 "	if [ -r \"$xd\" -o -w \"$xd\" -o -x \"$xd\" ]; then\n"
 "		if echo \"$nsout\" | grep \"/tmp/.X11-unix/X$d[  ]*\\$\" > /dev/null; then\n"
@@ -1148,7 +1167,7 @@ char create_display[] =
 "			fi\n"
 "		fi\n"
 "	fi\n"
-"	server $have_Xvfb :$N $sarg 0 ${geom}x${depth}\n"
+"	server $have_Xvfb :$N +kb $sarg 0 ${geom}x${depth}\n"
 "	#have_startx=$save_have_startx\n"
 "\n"
 "	if [ \"X$result\" = \"X1\" -a \"X$have_xmodmap\" != \"X\" ]; then\n"
@@ -1233,6 +1252,9 @@ char create_display[] =
 "\n"
 "depth=${depth:-16}\n"
 "geom=${geom:-1280x1024}\n"
+"if [ \"X$X11VNC_CREATE_GEOM\" != \"X\" -a \"X$FD_GEOM\" = \"X\" ]; then\n"
+"	FD_GEOM=$X11VNC_CREATE_GEOM\n"
+"fi\n"
 "\n"
 "if [ \"X$FD_GEOM\" != \"X\" -a \"X$FD_GEOM\" != \"XNONE\" ]; then\n"
 "	x1=`echo \"$FD_GEOM\" | awk -Fx '{print $1}'`\n"

x11vnc/v4l.c

@@ -12,6 +12,7 @@
 #if LIBVNCSERVER_HAVE_LINUX_VIDEODEV_H
 #if LIBVNCSERVER_HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#define CONFIG_VIDEO_V4L1_COMPAT
 #include <linux/videodev.h>
 #define V4L_OK
 #endif

x11vnc/x11vnc.1

 .\" This file was automatically generated from x11vnc -help output.
-.TH X11VNC "1" "March 2007" "x11vnc " "User Commands"
+.TH X11VNC "1" "April 2007" "x11vnc " "User Commands"
 .SH NAME
 x11vnc - allow VNC connections to real X11 displays
-         version: 0.8.5, lastmod: 2007-03-24
+         version: 0.8.5, lastmod: 2007-04-06
 .SH SYNOPSIS
 .B x11vnc
 [OPTION]...
@@ -1011,6 +1011,10 @@ by client web browsers.  For example:
 Where /.../x11vnc is the full path to x11vnc.
 It is used in the Apache SSL-portal example (see FAQ).
 .IP
+In this mode you can set X11VNC_SKIP_DISPLAY to a comma
+separated list of displays (e.g. ":0,:1") to ignore
+in the finding process.
+.IP
 An interesting option is WAIT:cmd=FINDCREATEDISPLAY
 that is like FINDDISPLAY in that is uses the same method
 to find an existing display.  However, if it does not
@@ -1063,6 +1067,11 @@ X server running the X case may only work on Linux
 .IR startx (1)
 ).
 .IP
+You can set the environment variable FD_GEOM (or
+X11VNC_CREATE_GEOM) to WxH or WxHxD to set the width
+and height and optionally the color depth of the
+created display.
+.IP
 If you want the FINDCREATEDISPLAY session to contact an
 XDMCP login manager (xdm/gdm/kdm) on the same machine,
 then use "Xvfb.xdmcp" instead of "Xvfb", etc.

x11vnc/x11vnc.c

@@ -1505,6 +1505,7 @@ char msg[] =
 "       to it in your viewer; adjust your viewer's size to hide it.\n"
 "\n"
 "More info: http://www.karlrunge.com/x11vnc/#faq-client-caching\n"
+"\n"
 "waiting for connections:\n"
 ;
 

x11vnc/x11vnc_defs.c

@@ -15,7 +15,7 @@ int xtrap_base_event_type = 0;
 int xdamage_base_event_type = 0;
 
 /*               date +'lastmod: %Y-%m-%d' */
-char lastmod[] = "0.8.5 lastmod: 2007-03-24";
+char lastmod[] = "0.8.5 lastmod: 2007-04-06";
 
 /* X display info */