x11vnc: -display WAIT:cmd=FINDDISPLAY, HTTPONCE, -http_ssl option, Java fixes.

1 files changed, 20 insertions, 9 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index dc89c68..87062ce 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -316,7 +316,10 @@ void print_help(int mode) {
 "                       where the Java vncviewer applet is, have x11vnc try\n"
 "                       to *guess* where the directory is by looking relative\n"
 "                       to the program location and in standard locations\n"
-"                       (/usr/local/share/x11vnc/classes, etc).\n"
+"                       (/usr/local/share/x11vnc/classes, etc).  Under -ssl or\n"
+"                       -stunnel the ssl classes subdirectory is sought.\n"
+"-http_ssl              As -http, but force lookup for ssl classes subdir.\n"
+"\n"
 "-connect string        For use with \"vncviewer -listen\" reverse connections.\n"
 "                       If \"string\" has the form \"host\" or \"host:port\"\n"
 "                       the connection is made once at startup.  Use commas\n"
@@ -602,9 +605,22 @@ void print_help(int mode) {
 "                       SSL helper process that will not switch, but it is only\n"
 "                       encoding and decoding the stream at that point.\n"
 "\n"
-"                       As a special case, WAIT:cmd=FINDDISPLAY will run a\n"
-"                       script that works on most Unixes to determine a user's\n"
-"                       DISPLAY variable and xauthority data.  this is TBD.\n"
+"                       As a special case, WAIT:cmd=FINDDISPLAY will run\n"
+"                       a script that works on most Unixes to determine a\n"
+"                       user's DISPLAY variable and xauthority data.  To have\n"
+"                       this default script printed to stdout (e.g. for\n"
+"                       customization) run with WAIT:cmd=FINDDISPLAY-print\n"
+"\n"
+"                       As another special case, WAIT:cmd=HTTPONCE will allow\n"
+"                       x11vnc to service one http request and then exit.\n"
+"                       This is usually done in -inetd mode to run on, say,\n"
+"                       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"
+"\n"
+"                       Is used in the Apache SSL-portal example (see FAQ).\n"
 "\n"
 "                       Finally, one can insert a geometry between colons,\n"
 "                       e.g. WAIT:1280x1024:... to set the size of the display\n"
@@ -1122,11 +1138,6 @@ void print_help(int mode) {
 "                       the -rfbauth option.  If none of these succeed x11vnc\n"
 "                       exits immediately.\n"
 "\n"
-#ifndef REL81
-"                       Note: -unixpw currently does not count as a password\n"
-"                       method by this option.\n"
-"\n"
-#endif
 "-storepasswd pass file Store password \"pass\" as the VNC password in the\n"
 "                       file \"file\".  Once the password is stored the\n"
 "                       program exits.  Use the password via \"-rfbauth file\"\n"