classes/ssl: Many improvements to Java SSL applet, onetimekey

          serverCert param, debugging printout, user dialogs, catch
          socket exceptions, autodetect x11vnc for GET=1.
x11vnc: misc/scripts: desktop.cgi, inet6to4, panner.pl.
          X11VNC_HTTPS_DOWNLOAD_WAIT_TIME, -unixpw %xxx documented, and
          can run user cmd in UNIXPW_CMD. FD_XDMCP_IF for create script,
          autodetect dm on udp6 only.  Queries: pointer_x, pointer_y,
          pointer_same, pointer_root.  Switch on -xkd if keysyms per key >
          4 in all cases.  daemon mode improvements for connect_switch,
          inet6to4, ultravnc_repeater.pl.  Dynamic change of -clip do
          not create new fb if WxH is unchanged.

1 files changed, 67 insertions, 17 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index 874291c..7a89a32 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -518,6 +518,11 @@ void print_help(int mode) {
 "                       -stunnel the ssl classes subdirectory is sought.\n"
 "-http_ssl              As -http, but force lookup for ssl classes subdir.\n"
 "\n"
+"                       Note that for HTTPS, single-port Java applet delivery\n"
+"                       you can set X11VNC_HTTPS_DOWNLOAD_WAIT_TIME to the\n"
+"                       max number of seconds to wait for the applet download\n"
+"                       to finish.  The default is 15.\n"
+"\n"
 "-avahi                 Use the Avahi/mDNS ZeroConf protocol to advertise\n"
 "                       this VNC server to the local network. (Related terms:\n"
 "                       Rendezvous, Bonjour).  Depending on your setup, you\n"
@@ -965,9 +970,31 @@ void print_help(int mode) {
 "                       the user is allowed, but the option values associated\n"
 "                       with it do apply as normal.\n"
 "\n"
-"                       There are also some utilities for testing password\n"
+"                       There are also some utilities for checking passwords\n"
 "                       if [list] starts with the \"%%\" character.  See the\n"
-"                       quick_pw() function in the source for details.\n"
+"                       quick_pw() function for more details.  Description:\n"
+"                       \"%%-\" or \"%%stdin\" means read one line from stdin.\n"
+"                       \"%%env\" means it is in $UNIXPW env var.  A leading\n"
+"                       \"%%/\" or \"%%.\" means read the first line from the\n"
+"                       filename that follows after the %% character. %% by\n"
+"                       itself means prompt for the username and password.\n"
+"                       Otherwise: %%user:pass   E.g. -unixpw %%fred:swordfish\n"
+"                       For the other cases user:pass is read from the indicated\n"
+"                       source.  If the password is correct 'Y user' is printed\n"
+"                       and the program exit code is 0.  If the password is\n"
+"                       incorrect it prints 'N user' and the exit code is 1.\n"
+"                       If there is some other error the exit code is 2.\n"
+"                       This feature enables x11vnc to be a general unix user\n"
+"                       password checking tool; it could be used from scripts\n"
+"                       or other programs.  These %% password checks also apply\n"
+"                       to the -unixpw_nis and -unixpw_cmd options.\n"
+"\n"
+"                       For the %% password check, if the env. var. UNIXPW_CMD\n"
+"                       is set to a command then it is run as the user (assuming\n"
+"                       the password is correct.)  The output of the command is\n"
+"                       not printed, the program or script must manage that by\n"
+"                       some other means.  The exit code of x11vnc will depend\n"
+"                       on the exit code of the command that is run.\n"
 "\n"
 "                       Use -nounixpw to disable unixpw mode if it was enabled\n"
 "                       earlier in the cmd line (e.g. -svc mode)\n"
@@ -1072,8 +1099,11 @@ void print_help(int mode) {
 "                       supplied unixpw_cmd to do user switching if desired\n"
 "                       and if it has the permissions to do so.\n"
 "\n"
-"-find                  Find the user's display using FINDDISPLAY. This is an\n"
-"                       alias for \"-display WAIT:cmd=FINDDISPLAY\".\n"
+"-find                  Find the user's display using FINDDISPLAY. This\n"
+"                       is an alias for \"-display WAIT:cmd=FINDDISPLAY\".\n"
+"\n"
+"                       Note: if a -display occurs later on the command line\n"
+"                       it will override the -find setting.\n"
 "\n"
 "                       For this and the next few options see -display WAIT:...\n"
 "                       below for all of the details.\n"
@@ -1111,6 +1141,9 @@ void print_help(int mode) {
 "                       FINDCREATEDISPLAY method.  This is an alias for\n"
 "                       \"-display WAIT:cmd=FINDCREATEDISPLAY-Xvfb\".\n"
 "\n"
+"                       Note: if a -display occurs later on the command line\n"
+"                       it will override the -create setting.\n"
+"\n"
 "                       SSH NOTE: for both -find and -create you can (should!)\n"
 "                       add the \"-localhost\" option to force SSH tunnel access.\n"
 "\n"
@@ -1128,6 +1161,10 @@ void print_help(int mode) {
 "                       -display WAIT:cmd=FINDCREATEDISPLAY-Xvfb -unixpw -users\n"
 "                       unixpw= -ssl SAVE   Also \"-service\".\n"
 "\n"
+"                       Note: if a -display, -unixpw, -users, or -ssl occurs\n"
+"                       later on the command line it will override the -svc\n"
+"                       setting.\n"
+"\n"
 "-svc_xdummy            As -svc except Xdummy instead of Xvfb.\n"
 "-svc_xvnc              As -svc except Xvnc instead of Xvfb.\n"
 "-svc_xdummy_xvfb       As -svc with Xdummy,Xvfb.\n"
@@ -1136,6 +1173,10 @@ void print_help(int mode) {
 "                       Alias for -display WAIT:cmd=FINDCREATEDISPLAY-Xvfb.xdmcp\n"
 "                       -unixpw -users unixpw= -ssl SAVE  Also \"-xdm_service\".\n"
 "\n"
+"                       Note: if a -display, -unixpw, -users, or -ssl occurs\n"
+"                       later on the command line it will override the -xdmsvc\n"
+"                       setting.\n"
+"\n"
 "                       To create a session a user will have to first log in\n"
 "                       to the -unixpw dialog and then log in again to the\n"
 "                       XDM/GDM/KDM prompt.  Subsequent re-connections will\n"
@@ -1485,6 +1526,11 @@ void print_help(int mode) {
 "                       X property, that makes FINDDISPLAY only find sessions\n"
 "                       with that tag value.\n"
 "\n"
+"                       Set FD_XDMCP_IF to the network interface that the\n"
+"                       display manager is running on; default is 'localhost'\n"
+"                       but you may need to set it to '::1' on some IPv6 only\n"
+"                       systems or misconfigured display managers.\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"
@@ -2147,7 +2193,7 @@ void print_help(int mode) {
 "                       exits.\n"
 "\n"
 "\n"
-"-stunnel [pem]         Use the stunnel(8) (www.stunnel.org) to provide an\n"
+"-stunnel [pem]         Use the stunnel(8) (stunnel.mirt.net) to provide an\n"
 "                       encrypted SSL tunnel between viewers and x11vnc.\n"
 "\n"
 "                       This external tunnel method was implemented prior to the\n"
@@ -4980,6 +5026,10 @@ void print_help(int mode) {
 "                                       for root window, use +id for children.\n"
 "                       grab_state      get state of pointer and keyboard grab.\n"
 "                       pointer_pos     print XQueryPointer x,y cursor position.\n"
+"                       pointer_x       print XQueryPointer x cursor position.\n"
+"                       pointer_y       print XQueryPointer y cursor position.\n"
+"                       pointer_same    print XQueryPointer ptr on same screen.\n"
+"                       pointer_root    print XQueryPointer curr ptr rootwin.\n"
 "                       mouse_x         print x11vnc's idea of cursor position.\n"
 "                       mouse_y         print x11vnc's idea of cursor position.\n"
 "                       noop            do nothing.\n"
@@ -5278,18 +5328,18 @@ void print_help(int mode) {
 "                       http_url auth xauth users rootshift clipshift scale_str\n"
 "                       scaled_x scaled_y scale_numer scale_denom scale_fac_x\n"
 "                       scale_fac_y scaling_blend scaling_nomult4 scaling_pad\n"
-"                       scaling_interpolate inetd privremote unsafe safer\n"
-"                       nocmds passwdfile unixpw unixpw_nis unixpw_list ssl\n"
-"                       ssl_pem sslverify stunnel stunnel_pem https httpsredir\n"
-"                       usepw using_shm logfile o flag rmflag rc norc h help\n"
-"                       V version lastmod bg sigpipe threads readrate netrate\n"
-"                       netlatency pipeinput clients client_count pid ext_xtest\n"
-"                       ext_xtrap ext_xrecord ext_xkb ext_xshm ext_xinerama\n"
-"                       ext_overlay ext_xfixes ext_xdamage ext_xrandr rootwin\n"
-"                       num_buttons button_mask mouse_x mouse_y grab_state\n"
-"                       pointer_pos bpp depth indexed_color dpy_x dpy_y wdpy_x\n"
-"                       wdpy_y off_x off_y cdpy_x cdpy_y coff_x coff_y rfbauth\n"
-"                       passwd viewpasswd\n"
+"                       scaling_interpolate inetd privremote unsafe safer nocmds\n"
+"                       passwdfile unixpw unixpw_nis unixpw_list ssl ssl_pem\n"
+"                       sslverify stunnel stunnel_pem https httpsredir usepw\n"
+"                       using_shm logfile o flag rmflag rc norc h help V version\n"
+"                       lastmod bg sigpipe threads readrate netrate netlatency\n"
+"                       pipeinput clients client_count pid ext_xtest ext_xtrap\n"
+"                       ext_xrecord ext_xkb ext_xshm ext_xinerama ext_overlay\n"
+"                       ext_xfixes ext_xdamage ext_xrandr rootwin num_buttons\n"
+"                       button_mask mouse_x mouse_y grab_state pointer_pos\n"
+"                       pointer_x pointer_y pointer_same pointer_root bpp depth\n"
+"                       indexed_color dpy_x dpy_y wdpy_x wdpy_y off_x off_y\n"
+"                       cdpy_x cdpy_y coff_x coff_y rfbauth passwd viewpasswd\n"
 "\n"
 "-QD variable           Just like -query variable, but returns the default\n"
 "                       value for that parameter (no running x11vnc server\n"