X11VNC_EXTRA_HTTPS_PARAMS, X11VNC_HTTP_LISTEN_LOCALHOST, X11VNC_REOPEN_SLEEP_MAX,

-findauth/-auth guess FD_XDM=1 for root, work around xhost SI:localuser:root.

1 files changed, 54 insertions, 9 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index 279c964..03c9171 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -118,6 +118,12 @@ void print_help(int mode) {
 "                       mechanism (described below) to try to guess the\n"
 "                       XAUTHORITY filename and use it.\n"
 "\n"
+"                       XDM/GDM/KDM: if you are running x11vnc as root and want\n"
+"                       to find the XAUTHORITY before anyone has logged into an\n"
+"                       X session yet, use: x11vnc -env FD_XDM=1 -auth guess ...\n"
+"                       (This will also find the XAUTHORITY if a user is already\n"
+"                       logged into the X session.)\n"
+"\n"
 "-N                     If the X display is :N, try to set the VNC display to\n"
 "                       also be :N This just sets the -rfbport option to 5900+N\n"
 "                       The program will exit immediately if that port is not\n"
@@ -139,7 +145,10 @@ void print_help(int mode) {
 "                       for display managers like GDM (KillInitClients option)\n"
 "                       that kill x11vnc just after the user logs into the\n"
 "                       X session.  Note: the reopened state may be unstable.\n"
-"                       Set X11VNC_REOPEN_DISPLAY=n to reopen n times.\n"
+"                       Set X11VNC_REOPEN_DISPLAY=n to reopen n times and\n"
+"                       set X11VNC_REOPEN_SLEEP_MAX to the number of seconds,\n"
+"                       default 10, to keep trying to reopen the display (once\n"
+"                       per second.)\n"
 "\n"
 "                       Update: as of 0.9.9, x11vnc tries to automatically avoid\n"
 "                       being killed by the display manager by delaying creating\n"
@@ -1064,17 +1073,23 @@ void print_help(int mode) {
 "                       (i.e. all the X displays on the local machine that you\n"
 "                       have access rights to).\n"
 "\n"
-"-findauth [disp]       Apply the -find/-finddpy heuristics to try to guess the\n"
-"                       XAUTHORITY file for DISPLAY 'disp'.  If 'disp' is not\n"
-"                       supplied, then the value in the -display earlier in\n"
+"-findauth [disp]       Apply the -find/-finddpy heuristics to try to guess\n"
+"                       the XAUTHORITY file for DISPLAY 'disp'.  If 'disp'\n"
+"                       is not supplied, then the value in the -display on\n"
 "                       the cmdline is used; failing that $DISPLAY is used;\n"
 "                       and failing that \":0\" is used.\n"
 "\n"
 "                       If nothing is printed out, that means no XAUTHORITY was\n"
-"                       found for 'disp'.  If \"XAUTHORITY=\" is printed out,\n"
-"                       that means use the default (i.e. do not set XAUTHORITY).\n"
-"                       If \"XAUTHORITY=/path/to/file\" is printed out, then\n"
-"                       use that file.\n"
+"                       found for 'disp'; i.e. failure.  If \"XAUTHORITY=\"\n"
+"                       is printed out, that means use the default (i.e. do\n"
+"                       not set XAUTHORITY).  If \"XAUTHORITY=/path/to/file\"\n"
+"                       is printed out, then use that file.\n"
+"\n"
+"                       XDM/GDM/KDM: if you are running x11vnc as root and want\n"
+"                       to find the XAUTHORITY before anyone has logged into an\n"
+"                       X session yet, use: x11vnc -env FD_XDM=1 -findauth ...\n"
+"                       (This will also find the XAUTHORITY if a user is already\n"
+"                       logged into the X session.)\n"
 "\n"
 "-create                First try to find the user's display using FINDDISPLAY,\n"
 "                       if that doesn't succeed create an X session via the\n"
@@ -1316,6 +1331,12 @@ void print_help(int mode) {
 "                       for how to disable this for dtgreet on Solaris and\n"
 "                       possibly for other greeters.\n"
 "\n"
+"                       In -find/cmd=FINDDISPLAY mode, if you set FD_XDM=1,\n"
+"                       e.g. 'x11vnc -env FD_XDM=1 -find ...' and x11vnc is\n"
+"                       running as root (e.g. inetd) then it will try to find\n"
+"                       the XAUTHORITY file of a running XDM/GDM/KDM login\n"
+"                       greeter (i.e. no user has logged into an X session yet.)\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"
@@ -2315,7 +2336,21 @@ void print_help(int mode) {
 "                       to include the PORT= in the browser URL, simply supply\n"
 "                       \"-httpsredir\" to x11vnc.\n"
 "\n"
-"                       This options does not work in -stunnel mode.\n"
+"                       This option does not work in -stunnel mode.\n"
+"\n"
+"                       More tricks: set the env var X11VNC_EXTRA_HTTPS_PARAMS\n"
+"                       to be extra URL parameters to use.  This way you do\n"
+"                       not need to specify extra PARAMS in the index.vnc file.\n"
+"                       E.g. x11vnc -env X11VNC_EXTRA_HTTPS_PARAMS='?GET=1' ...\n"
+"\n"
+"                       If you do not want to expose the non-SSL HTTP port to\n"
+"                       the network (i.e. you just want the single VNC/HTTPS\n"
+"                       port, e.g. 5900, open for connections) then specify the\n"
+"                       option -env X11VNC_HTTP_LISTEN_LOCALHOST=1  This way\n"
+"                       the connection to the libvncserver httpd server will\n"
+"                       only be available on localhost (note that in -ssl mode,\n"
+"                       HTTPS requests are redirected from SSL to the non-SSL\n"
+"                       libvncserver HTTP server.)\n"
 "\n"
 "-http_oneport          For UN-encrypted connections mode (i.e. no -ssl,\n"
 "                       -stunnel, or -enc options), allow the Java VNC Viewer\n"
@@ -2347,6 +2382,10 @@ void print_help(int mode) {
 "                       mode when using an SSH tunnel as well as for router\n"
 "                       port redirections.\n"
 "\n"
+"                       Note that the -env X11VNC_HTTP_LISTEN_LOCALHOST=1\n"
+"                       option described above under -httpsredir applies for\n"
+"                       the libvncserver httpd server in all cases (ssl or not.)\n"
+"\n"
 "-ssh user@host:disp    Create a remote listening port on machine \"host\"\n"
 "                       via a SSH tunnel using the -R rport:localhost:lport\n"
 "                       method. lport will be the local x11vnc listening port,\n"
@@ -3179,6 +3218,12 @@ void print_help(int mode) {
 "                       -buttonmap currently does not work on MacOSX console\n"
 "                       or in -rawfb mode.\n"
 "\n"
+"                       Workaround: use -buttonmap IJ...-LM...=n to limit the\n"
+"                       number of mouse buttons to n, e.g. 123-123=3.  This will\n"
+"                       prevent x11vnc from crashing if the X server reports\n"
+"                       there are 5 buttons (4/5 scroll wheel), but there are\n"
+"                       only really 3.\n"
+"\n"
 "-nodragging            Do not update the display during mouse dragging events\n"
 "                       (mouse button held down).  Greatly improves response on\n"
 "                       slow setups, but you lose all visual feedback for drags,\n"