install ss_vncviewer 755, -prog option, HTTPONCE new socket for -inetd.

prepare_x11vnc_dist.sh

@@ -84,7 +84,10 @@ cp classes/ssl/Makefile.am classes/ssl/Makefile.am.LibVNCServer
 sed -e 's/EXTRA_DIST=/EXTRA_DIST=tightvnc-1.3dev7_javasrc-vncviewer-ssl.patch tightvnc-1.3dev7_javasrc-vncviewer-cursor-colors+no-tab-traversal.patch /' \
 	classes/ssl/Makefile.am.LibVNCServer > classes/ssl/Makefile.am
 echo 'pkgdatadir = $(datadir)/@PACKAGE@/classes/ssl' >> classes/ssl/Makefile.am
-echo 'pkgdata_DATA=VncViewer.jar index.vnc SignedVncViewer.jar proxy.vnc ssl_vncviewer README' >> classes/ssl/Makefile.am
+echo 'pkgdata_DATA=VncViewer.jar index.vnc SignedVncViewer.jar proxy.vnc README' >> classes/ssl/Makefile.am
+echo 'pkgdata_SCRIPTS=ss_vncviewer' >> classes/ssl/Makefile.am
+
+chmod 755 classes/ssl/ss_vncviewer
 
 mv acinclude.m4 acinclude.m4.LibVNCServer
 

x11vnc/ChangeLog

+2006-11-23  Karl Runge <runge@karlrunge.com>
+	* prepare_x11vnc_dist.sh: make ss_vncviewer installed 755.
+	* x11vnc: for HTTPONCE open new http port in -inetd mode.
+	  -prog option to indicate full path to program (not know
+	  when in -inetd and tcpd)
+
 2006-11-21  Karl Runge <runge@karlrunge.com>
 	* x11vnc: macosx: problem with padded framebuffer rows, wait for
 	  user to switch back, CutText xfer support, ignore a few more

x11vnc/help.c

@@ -448,7 +448,7 @@ void print_help(int mode) {
 "                       encrypted, only obscured with a fixed key).\n"
 "\n"
 "                       If the filename is prefixed with \"read:\" it will\n"
-"                       periodically be checked for changes and reread.  It it\n"
+"                       periodically be checked for changes and reread.  It is\n"
 "                       guaranteed to be reread just when a new client connects\n"
 "                       so that the latest passwords will be used.\n"
 "\n"
@@ -656,8 +656,8 @@ void print_help(int mode) {
 "                       to use -users unixpw= to switch the process user after\n"
 "                       the user logs in.\n"
 "\n"
-"-unixpw_cmd str        As -unixpw above, however do not use su(1) but rather\n"
-"                       run the externally supplied command \"str\".  The first\n"
+"-unixpw_cmd cmd        As -unixpw above, however do not use su(1) but rather\n"
+"                       run the externally supplied command \"cmd\".  The first\n"
 "                       line of its stdin will the username and the second line\n"
 "                       the received password.  If the command exits with status\n"
 "                       0 (success) the VNC client will be accepted.  It will be\n"
@@ -758,9 +758,11 @@ void print_help(int mode) {
 "                       port 5800 and allow the Java vncviewer to be downloaded\n"
 "                       by client web browsers.  For example:\n"
 "\n"
-"                        5815 stream tcp nowait root /usr/sbin/tcpd .../x11vnc \\\n"
-"                          -inetd -q -http_ssl -display WAIT:cmd=HTTPONCE\n"
+"                        5815 stream tcp nowait root /usr/sbin/tcpd /.../x11vnc \\\n"
+"                          -inetd -q -http_ssl -prog /.../x11vnc \\\n"
+"                          -display WAIT:cmd=HTTPONCE\n"
 "\n"
+"                       Where /.../x11vnc is the full path to x11vnc.\n"
 "                       It is used in the Apache SSL-portal example (see FAQ).\n"
 "\n"
 "                       Finally, one can insert a geometry between colons,\n"
@@ -1609,6 +1611,8 @@ void print_help(int mode) {
 "                       avoid shell script wrappers, etc. to set the env. var.\n"
 "                       You may specify as many of these as needed on the\n"
 "                       command line.\n"
+"-prog /path/to/x11vnc  Set the full path to the x11vnc program for cases when\n"
+"                       it cannot be determined from argv[0] (e.g. tcpd/inetd)\n"
 "\n"
 "-h, -help              Print this help text.\n"
 "-?, -opts              Only list the x11vnc options.\n"
@@ -2869,7 +2873,7 @@ void print_help(int mode) {
 "                       pointer) use \"touch\" or \"touch=WxH\".\n"
 "\n"
 "                       If you set the env. var X11VNC_UINPUT_THRESHOLDS then\n"
-"                       the thresh=n mode will be enabled.  It it currently\n"
+"                       the thresh=n mode will be enabled.  It is currently\n"
 "                       not working well.  If |dx| <= thresh and |dy| < thresh\n"
 "                       no acceleration is applied.  Use \"thresh=+n\" |dx| +\n"
 "                       |dy| < thresh to be used instead (X11?)\n"

x11vnc/remote.c

@@ -277,7 +277,7 @@ int check_httpdir(void) {
 		struct stat sbuf;
 		int len;
 
-		rfbLog("check_httpdir: trying to guess httpdir...\n");
+		rfbLog("check_httpdir: trying to guess httpdir... %s\n", program_name);
 		if (program_name[0] == '/') {
 			prog = strdup(program_name);
 		} else {

x11vnc/user.c

@@ -1020,8 +1020,8 @@ rfbBool custom_passwd_check(rfbClientPtr cl, const char *response, int len) {
 static void handle_one_http_request(void) {
 
 	rfbLog("handle_one_http_request: begin.\n");
-	if (screen->httpPort == 0) {
-		int port = find_free_port(5800, 5850);
+	if (inetd || screen->httpPort == 0) {
+		int port = find_free_port(5800, 5860);
 		if (port) {
 			screen->httpPort = port;
 		} else {

x11vnc/x11vnc.1

@@ -2,7 +2,7 @@
 .TH X11VNC "1" "November 2006" "x11vnc " "User Commands"
 .SH NAME
 x11vnc - allow VNC connections to real X11 displays
-         version: 0.8.4, lastmod: 2006-11-21
+         version: 0.8.4, lastmod: 2006-11-23
 .SH SYNOPSIS
 .B x11vnc
 [OPTION]...
@@ -549,7 +549,7 @@ password file should not be readable by untrusted users
 encrypted, only obscured with a fixed key).
 .IP
 If the filename is prefixed with "read:" it will
-periodically be checked for changes and reread.  It it
+periodically be checked for changes and reread.  It is
 guaranteed to be reread just when a new client connects
 so that the latest passwords will be used.
 .IP
@@ -780,12 +780,12 @@ in /etc/shadow can then be authenticated.  You may want
 to use \fB-users\fR unixpw= to switch the process user after
 the user logs in.
 .PP
-\fB-unixpw_cmd\fR \fIstr\fR
+\fB-unixpw_cmd\fR \fIcmd\fR
 .IP
 As \fB-unixpw\fR above, however do not use 
 .IR su (1)
 but rather
-run the externally supplied command \fIstr\fR.  The first
+run the externally supplied command \fIcmd\fR.  The first
 line of its stdin will the username and the second line
 the received password.  If the command exits with status
 0 (success) the VNC client will be accepted.  It will be
@@ -888,9 +888,11 @@ This is usually done in \fB-inetd\fR mode to run on, say,
 port 5800 and allow the Java vncviewer to be downloaded
 by client web browsers.  For example:
 .IP
-5815 stream tcp nowait root /usr/sbin/tcpd .../x11vnc \\
-\fB-inetd\fR \fB-q\fR \fB-http_ssl\fR \fB-display\fR WAIT:cmd=HTTPONCE
+5815 stream tcp nowait root /usr/sbin/tcpd /.../x11vnc \\
+\fB-inetd\fR \fB-q\fR \fB-http_ssl\fR \fB-prog\fR /.../x11vnc \\
+\fB-display\fR WAIT:cmd=HTTPONCE
 .IP
+Where /.../x11vnc is the full path to x11vnc.
 It is used in the Apache SSL-portal example (see FAQ).
 .IP
 Finally, one can insert a geometry between colons,
@@ -1855,6 +1857,11 @@ avoid shell script wrappers, etc. to set the env. var.
 You may specify as many of these as needed on the
 command line.
 .PP
+\fB-prog\fR \fI/path/to/x11vnc\fR
+.IP
+Set the full path to the x11vnc program for cases when
+it cannot be determined from argv[0] (e.g. tcpd/inetd)
+.PP
 \fB-h,\fR \fB-help\fR
 .IP
 Print this help text.
@@ -3358,7 +3365,7 @@ device is a touchscreen (assumed to have an absolute
 pointer) use "touch" or "touch=WxH".
 .IP
 If you set the env. var X11VNC_UINPUT_THRESHOLDS then
-the thresh=n mode will be enabled.  It it currently
+the thresh=n mode will be enabled.  It is currently
 not working well.  If |dx| <= thresh and |dy| < thresh
 no acceleration is applied.  Use "thresh=+n" |dx| +
 |dy| < thresh to be used instead (X11?)

x11vnc/x11vnc.c

@@ -1946,6 +1946,12 @@ int main(int argc, char* argv[]) {
 			;	/* done above */
 		} else if (!strcmp(arg, "-env")) {
 			i++;	/* done above */
+		} else if (!strcmp(arg, "-prog")) {
+			CHECK_ARGC
+			if (program_name) {
+				free(program_name);
+			}
+			program_name = strdup(argv[++i]);
 		} else if (!strcmp(arg, "-h") || !strcmp(arg, "-help")) {
 			print_help(0);
 		} else if (!strcmp(arg, "-?") || !strcmp(arg, "-opts")) {

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.4 lastmod: 2006-11-21";
+char lastmod[] = "0.8.4 lastmod: 2006-11-23";
 
 /* X display info */