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, 63 insertions, 13 deletions

diff --git a/x11vnc/README b/x11vnc/README
index b041f1a..7115695 100644
--- a/x11vnc/README
+++ b/x11vnc/README
@@ -2,7 +2,7 @@
 Copyright (C) 2002-2009 Karl J. Runge <runge@karlrunge.com>
 All rights reserved.
 
-x11vnc README file                         Date: Fri Dec  4 20:44:56 EST 2009
+x11vnc README file                         Date: Mon Dec  7 08:14:20 EST 2009
 
 The following information is taken from these URLs:
 
@@ -932,7 +932,12 @@ make
        applies heuristics that try to determine the XAUTHORITY file. The
        use of '[130]-auth guess' will use the XAUTHORITY that -findauth
        reveals. This can be handy in with the lastest GDM where the
-       ability to store cookies in ~/.Xauthority has been removed.
+       ability to store cookies in ~/.Xauthority has been removed. If
+       x11vnc is running as root (e.g. inetd) and you add -env FD_XDM=1
+       to the above -findauth or -auth guess command lines, it will find
+       the correct XAUTHORITY for the given display (this works for
+       XDM/GDM/KDM if the login greeter panel is up or if someone has
+       already logged into an X session.)
      * The FINDDISPLAY and FINDCREATEDISPLAY modes (i.e. "[131]-display
        WAIT:cmd=...", [132]-find, [133]-create) now work correctly for
        the user-supplied login program scheme "[134]-unixpw_cmd ...", as
@@ -12894,7 +12899,7 @@ x11vnc: a VNC server for real X displays
    Here are all of x11vnc command line options:
 % x11vnc -opts      (see below for -help long descriptions)
 
-x11vnc: allow VNC connections to real X11 displays. 0.9.9 lastmod: 2009-12-04
+x11vnc: allow VNC connections to real X11 displays. 0.9.9 lastmod: 2009-12-06
 
 x11vnc options:
   -display disp            -auth file               -N                     
@@ -13021,7 +13026,7 @@ libvncserver-tight-extension options:
 
 % x11vnc -help
 
-x11vnc: allow VNC connections to real X11 displays. 0.9.9 lastmod: 2009-12-04
+x11vnc: allow VNC connections to real X11 displays. 0.9.9 lastmod: 2009-12-06
 
 (type "x11vnc -opts" to just list the options.)
 
@@ -13089,6 +13094,12 @@ Options:
                        mechanism (described below) to try to guess the
                        XAUTHORITY filename and use it.
 
+                       XDM/GDM/KDM: if you are running x11vnc as root and want
+                       to find the XAUTHORITY before anyone has logged into an
+                       X session yet, use: x11vnc -env FD_XDM=1 -auth guess ...
+                       (This will also find the XAUTHORITY if a user is already
+                       logged into the X session.)
+
 -N                     If the X display is :N, try to set the VNC display to
                        also be :N This just sets the -rfbport option to 5900+N
                        The program will exit immediately if that port is not
@@ -13110,7 +13121,10 @@ Options:
                        for display managers like GDM (KillInitClients option)
                        that kill x11vnc just after the user logs into the
                        X session.  Note: the reopened state may be unstable.
-                       Set X11VNC_REOPEN_DISPLAY=n to reopen n times.
+                       Set X11VNC_REOPEN_DISPLAY=n to reopen n times and
+                       set X11VNC_REOPEN_SLEEP_MAX to the number of seconds,
+                       default 10, to keep trying to reopen the display (once
+                       per second.)
 
                        Update: as of 0.9.9, x11vnc tries to automatically avoid
                        being killed by the display manager by delaying creating
@@ -14018,17 +14032,23 @@ Options:
                        (i.e. all the X displays on the local machine that you
                        have access rights to).
 
--findauth [disp]       Apply the -find/-finddpy heuristics to try to guess the
-                       XAUTHORITY file for DISPLAY 'disp'.  If 'disp' is not
-                       supplied, then the value in the -display earlier in
+-findauth [disp]       Apply the -find/-finddpy heuristics to try to guess
+                       the XAUTHORITY file for DISPLAY 'disp'.  If 'disp'
+                       is not supplied, then the value in the -display on
                        the cmdline is used; failing that $DISPLAY is used;
                        and failing that ":0" is used.
 
                        If nothing is printed out, that means no XAUTHORITY was
-                       found for 'disp'.  If "XAUTHORITY=" is printed out,
-                       that means use the default (i.e. do not set XAUTHORITY).
-                       If "XAUTHORITY=/path/to/file" is printed out, then
-                       use that file.
+                       found for 'disp'; i.e. failure.  If "XAUTHORITY="
+                       is printed out, that means use the default (i.e. do
+                       not set XAUTHORITY).  If "XAUTHORITY=/path/to/file"
+                       is printed out, then use that file.
+
+                       XDM/GDM/KDM: if you are running x11vnc as root and want
+                       to find the XAUTHORITY before anyone has logged into an
+                       X session yet, use: x11vnc -env FD_XDM=1 -findauth ...
+                       (This will also find the XAUTHORITY if a user is already
+                       logged into the X session.)
 
 -create                First try to find the user's display using FINDDISPLAY,
                        if that doesn't succeed create an X session via the
@@ -14270,6 +14290,12 @@ Options:
                        for how to disable this for dtgreet on Solaris and
                        possibly for other greeters.
 
+                       In -find/cmd=FINDDISPLAY mode, if you set FD_XDM=1,
+                       e.g. 'x11vnc -env FD_XDM=1 -find ...' and x11vnc is
+                       running as root (e.g. inetd) then it will try to find
+                       the XAUTHORITY file of a running XDM/GDM/KDM login
+                       greeter (i.e. no user has logged into an X session yet.)
+
                        As another special case, WAIT:cmd=HTTPONCE will allow
                        x11vnc to service one http request and then exit.
                        This is usually done in -inetd mode to run on, say,
@@ -15269,7 +15295,21 @@ Options:
                        to include the PORT= in the browser URL, simply supply
                        "-httpsredir" to x11vnc.
 
-                       This options does not work in -stunnel mode.
+                       This option does not work in -stunnel mode.
+
+                       More tricks: set the env var X11VNC_EXTRA_HTTPS_PARAMS
+                       to be extra URL parameters to use.  This way you do
+                       not need to specify extra PARAMS in the index.vnc file.
+                       E.g. x11vnc -env X11VNC_EXTRA_HTTPS_PARAMS='?GET=1' ...
+
+                       If you do not want to expose the non-SSL HTTP port to
+                       the network (i.e. you just want the single VNC/HTTPS
+                       port, e.g. 5900, open for connections) then specify the
+                       option -env X11VNC_HTTP_LISTEN_LOCALHOST=1  This way
+                       the connection to the libvncserver httpd server will
+                       only be available on localhost (note that in -ssl mode,
+                       HTTPS requests are redirected from SSL to the non-SSL
+                       libvncserver HTTP server.)
 
 -http_oneport          For UN-encrypted connections mode (i.e. no -ssl,
                        -stunnel, or -enc options), allow the Java VNC Viewer
@@ -15301,6 +15341,10 @@ Options:
                        mode when using an SSH tunnel as well as for router
                        port redirections.
 
+                       Note that the -env X11VNC_HTTP_LISTEN_LOCALHOST=1
+                       option described above under -httpsredir applies for
+                       the libvncserver httpd server in all cases (ssl or not.)
+
 -ssh user@host:disp    Create a remote listening port on machine "host"
                        via a SSH tunnel using the -R rport:localhost:lport
                        method. lport will be the local x11vnc listening port,
@@ -16135,6 +16179,12 @@ t
                        -buttonmap currently does not work on MacOSX console
                        or in -rawfb mode.
 
+                       Workaround: use -buttonmap IJ...-LM...=n to limit the
+                       number of mouse buttons to n, e.g. 123-123=3.  This will
+                       prevent x11vnc from crashing if the X server reports
+                       there are 5 buttons (4/5 scroll wheel), but there are
+                       only really 3.
+
 -nodragging            Do not update the display during mouse dragging events
                        (mouse button held down).  Greatly improves response on
                        slow setups, but you lose all visual feedback for drags,