x11vnc: COLUMNS=256 and other fixes to find/create scripts. More ratecheck.

1 files changed, 46 insertions, 20 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index c83e161..75d8700 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -782,22 +782,42 @@ void print_help(int mode) {
 "                       FINDCREATEDISPLAY method.  This is an alias for\n"
 "                       \"-display WAIT:cmd=FINDCREATEDISPLAY-Xvfb\".\n"
 "\n"
-"-xdummy                As in -create, except Xdummy instead of Xvfb.  Implies\n"
-"                       FD_XDUMMY_NOROOT=1.\n"
+"                       SSH NOTE: for both -find and -create you can (should!)\n"
+"                       add the \"-localhost\" option to force SSH tunnel access.\n"
+"\n"
+"-xdummy                As in -create, except Xdummy instead of Xvfb.\n"
 "-xvnc                  As in -create, except Xvnc instead of Xvfb.\n"
 "-xvnc_redirect         As in -create, except Xvnc.redirect instead of Xvfb.\n"
 "\n"
-"-svc                   Terminal services mode. Also \"-service\". Alias for\n"
-"                       -display WAIT:cmd=FINDCREATEDISPLAY-Xvfb -unixpw\n"
-"                       -users unixpw= -ssl SAVE\n"
+"-svc                   Terminal services mode based on SSL access.  Alias for\n"
+"                       -display WAIT:cmd=FINDCREATEDISPLAY-Xvfb -unixpw -users\n"
+"                       unixpw= -ssl SAVE   Also \"-service\".\n"
 "\n"
-"-svc_xdummy            As -svc except Xdummy instead of Xvfb.  Implies\n"
-"                       FD_XDUMMY_NOROOT=1.\n"
+"-svc_xdummy            As -svc except Xdummy instead of Xvfb.\n"
 "-svc_xvnc              As -svc except Xvnc instead of Xvfb.\n"
 "\n"
-"-xdmsvc                Terminal services mode. Also \"-xdm_service\". Alias for\n"
-"                       -display WAIT:cmd=FINDCREATEDISPLAY-Xvfb.xdmcp -unixpw\n"
-"                       -users unixpw= -ssl SAVE\n"
+"-xdmsvc                Display manager Terminal services mode based on SSL.\n"
+"                       Alias for -display WAIT:cmd=FINDCREATEDISPLAY-Xvfb.xdmcp\n"
+"                       -unixpw -users unixpw= -ssl SAVE  Also \"-xdm_service\".\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"
+"                       only require the -unixpw password.  See the discussion\n"
+"                       under -display WAIT:... for more details about XDM,\n"
+"                       etc configuration.\n"
+"\n"
+"-sshxdmsvc             Display manager Terminal services mode based on SSH.\n"
+"                       Alias for -display WAIT:cmd=FINDCREATEDISPLAY-Xvfb.xdmcp\n"
+"                       -localhost.\n"
+"\n"
+"                       The -localhost option constrains connections to come\n"
+"                       in via a SSH tunnel (which will require a login).\n"
+"                       To create a session a user will also have to log into\n"
+"                       the XDM GDM KDM prompt. Subsequent re-connections will\n"
+"                       only only require the SSH login.  See the discussion\n"
+"                       under -display WAIT:... for more details about XDM,\n"
+"                       etc configuration.\n"
 "\n"
 "-redirect port         As in FINDCREATEDISPLAY-Xvnc.redirect mode except\n"
 "                       redirect immediately (i.e. without X session finding\n"
@@ -948,14 +968,19 @@ void print_help(int mode) {
 "                       actually start up an X server.\n"
 "\n"
 "                       By default FINDCREATEDISPLAY will try Xdummy and then\n"
-"                       Xvfb.  The Xdummy wrapper is part of the x11vnc source\n"
-"                       code (x11vnc/misc/Xdummy)  It should be available in\n"
-"                       PATH and have run \"Xdummy -install\" once to create\n"
-"                       the shared library.  Xdummy requires root permission and\n"
-"                       only works on Linux.  (Note: specify FD_XDUMMY_NOROOT=1\n"
-"                       to skip a check for the root id; evidently your sudo(1)\n"
-"                       will take care of everything).  Xvfb is available on\n"
-"                       most platforms and does not require root.\n"
+"                       Xvfb:\n"
+"\n"
+"                       The Xdummy wrapper is part of the x11vnc source code\n"
+"                       (x11vnc/misc/Xdummy)  It should be available in PATH and\n"
+"                       have run \"Xdummy -install\" once to create the shared\n"
+"                       library.  Xdummy requires root permission and only works\n"
+"                       on Linux.  (Note: specify FD_XDUMMY_NOROOT=1 to skip\n"
+"                       a check for the root id; evidently your sudo(1) will\n"
+"                       take care of everything.  The -xdummy and -svc_xdummy\n"
+"                       options imply FD_XDUMMY_NOROOT=1).\n"
+"\n"
+"                       Xvfb is available on most platforms and does not\n"
+"                       require root.\n"
 "\n"
 "                       When x11vnc exits (i.e. user disconnects) the X\n"
 "                       server session stays running in the background.\n"
@@ -1027,8 +1052,9 @@ void print_help(int mode) {
 "                        for kdm in kdmrc:      Enable=true in section [Xdmcp]\n"
 "                        for xdm in xdm-config: DisplayManager.requestPort: 177\n"
 "\n"
-"                       See the shorthand options above \"-svc\" and \"-xdmsvc\"\n"
-"                       that specify the above options for some useful cases.\n"
+"                       See the shorthand options above \"-svc\", \"-xdmsvc\"\n"
+"                       and \"-sshxdmsvc\" that specify the above options for\n"
+"                       some useful cases.\n"
 "\n"
 "                       If you set the env. var WAITBG=1 x11vnc will go into\n"
 "                       the background once listening in wait mode.\n"