x11vnc: do CLIPBOARD, reverse conn require passwds, -usepw, -debug_sel, -storepasswd homedir.

1 files changed, 66 insertions, 19 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index 293104b..65edf94 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -306,11 +306,19 @@ void print_help(int mode) {
 "                       the connection is made once at startup.  Use commas\n"
 "                       for a list of host's and host:port's.\n"
 "\n"
+"                       Note that unlike most vnc servers, x11vnc will require a\n"
+"                       password for reverse as well as for forward connections.\n"
+"                       (provided password auth has been enabled, -rfbauth, etc)\n"
+"                       If you do not want to require a password for reverse\n"
+"                       connections set X11VNC_REVERSE_CONNECTION_NO_AUTH=1 in\n"
+"                       your environment before starting x11vnc.\n"
+"\n"
 "                       If \"string\" contains \"/\" it is instead interpreted\n"
 "                       as a file to periodically check for new hosts.\n"
 "                       The first line is read and then the file is truncated.\n"
 "                       Be careful for this usage mode if x11vnc is running as\n"
 "                       root (e.g. via gdm(1), etc).\n"
+"\n"
 "-vncconnect            Monitor the VNC_CONNECT X property set by the standard\n"
 "-novncconnect          VNC program vncconnect(1).  When the property is\n"
 "                       set to \"host\" or \"host:port\" establish a reverse\n"
@@ -507,10 +515,11 @@ void print_help(int mode) {
 "                       be inaccessible unless run as root.  This is called\n"
 "                       \"NIS\" mode simply because in most NIS setups the\n"
 "                       user encrypted passwords are accessible (e.g. \"ypcat\n"
-"                       passwd\").  NIS is not required for this mode to\n"
-"                       work, but it is unlikely it will work for any other\n"
-"                       environment.  All of the -unixpw options and contraints\n"
-"                       apply.\n"
+"                       passwd\").  NIS is not required for this mode to work\n"
+"                       (only that getpwnam(3) return the encrpyted password\n"
+"                       is required), but it is unlikely it will work for any\n"
+"                       other environment.  All of the -unixpw options and\n"
+"                       contraints apply.\n"
 "\n"
 "-stunnel [pem]         Use the stunnel(1) (www.stunnel.org) to provide\n"
 "                       an encrypted SSL tunnel between viewers and x11vnc.\n"
@@ -551,12 +560,28 @@ void print_help(int mode) {
 "-stunnel3  [pem]       Use version 3.x stunnel command line syntax instead of\n"
 "                       version 4.x\n"
 "\n"
-"-nopw                  Disable the big warning message when you use x11vnc\n"
-"                       without some sort of password.\n"
+"-usepw                 If no other password method was supplied on the command\n"
+"                       line, first look for ~/.vnc/passwd and if found use it\n"
+"                       with -rfbauth; next, look for ~/.vnc/passwdfile and\n"
+"                       use it with -passwdfile; otherwise, prompt the user\n"
+"                       for a password to create ~/.vnc/passwd and use it with\n"
+"                       the -rfbauth option.  If none of these succeed x11vnc\n"
+"                       exits immediately.\n"
+"\n"
+"                       Note: -unixpw currently does not count as a password\n"
+"                       method by this option.\n"
+"\n"
 "-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"
 "\n"
+"                       If called with no arguments, i.e., \"-storepasswd\",\n"
+"                       the user is prompted for a password and it is stored\n"
+"                       in the file ~/.vnc/passwd\n"
+"\n"
+"-nopw                  Disable the big warning message when you use x11vnc\n"
+"                       without some sort of password.\n"
+"\n"
 "-accept string         Run a command (possibly to prompt the user at the\n"
 "                       X11 display) to decide whether an incoming client\n"
 "                       should be allowed to connect or not.  \"string\" is\n"
@@ -946,10 +971,17 @@ void print_help(int mode) {
 "-nobell                Do not watch for XBell events. (no beeps will be heard)\n"
 "                       Note: XBell monitoring requires the XKEYBOARD extension.\n"
 "-nosel                 Do not manage exchange of X selection/cutbuffer between\n"
-"                       VNC viewers and the X server.\n"
+"                       VNC viewers and the X server at all.\n"
 "-noprimary             Do not poll the PRIMARY selection for changes to send\n"
 "                       back to clients.  (PRIMARY is still set on received\n"
 "                       changes, however).\n"
+"-nosetprimary          Do not set the PRIMARY selection for changes received\n"
+"                       from VNC clients.\n"
+"-noclipboard           Do not poll the CLIPBOARD selection for changes to send\n"
+"                       back to clients.  (CLIPBOARD is still set on received\n"
+"                       changes, however).\n"
+"-nosetclipboard        Do not set the CLIPBOARD selection for changes\n"
+"                       received from VNC clients.\n"
 "-seldir string         If direction string is \"send\", only send the selection\n"
 "                       to viewers, and if it is \"recv\" only receive it from\n"
 "                       viewers.  To work around apps setting the selection\n"
@@ -1429,6 +1461,9 @@ void print_help(int mode) {
 "-debug_grabs           Turn on debugging info printout with respect to\n"
 "                       XGrabServer() deadlock for -scrollcopyrect mode.\n"
 "\n"
+"-debug_sel             Turn on debugging info printout with respect to\n"
+"                       PRIMARY, CLIPBOARD, and CUTBUFFER0 selections.\n"
+"\n"
 "-pointer_mode n        Various pointer motion update schemes. \"-pm\" is\n"
 "                       an alias.  The problem is pointer motion can cause\n"
 "                       rapid changes on the screen: consider the rapid\n"
@@ -1853,7 +1888,9 @@ void print_help(int mode) {
 /* access, filename */
 "                       connect:host    do reverse connection to host, \"host\"\n"
 "                                       may be a comma separated list of hosts\n"
-"                                       or host:ports.  See -connect.\n"
+"                                       or host:ports.  See -connect.  Passwords\n"
+"                                       required as with fwd connections.\n"
+"                                       See X11VNC_REVERSE_CONNECTION_NO_AUTH=1\n"
 "                       disconnect:host disconnect any clients from \"host\"\n"
 "                                       same as \"close:host\".  Use host\n"
 "                                       \"all\" to close all current clients.\n"
@@ -1944,6 +1981,12 @@ void print_help(int mode) {
 "                       sel             disable -nosel mode.\n"
 "                       noprimary       enable  -noprimary mode.\n"
 "                       primary         disable -noprimary mode.\n"
+"                       nosetprimary    enable  -nosetprimary mode.\n"
+"                       setprimary      disable -nosetprimary mode.\n"
+"                       noclipboard     enable  -noclipboard mode.\n"
+"                       clipboard       disable -noclipboard mode.\n"
+"                       nosetclipboard  enable  -nosetclipboard mode.\n"
+"                       setclipboard    disable -nosetclipboard mode.\n"
 "                       seldir:str      set -seldir to \"str\"\n"
 "                       cursor:mode     enable  -cursor \"mode\".\n"
 "                       show_cursor     enable  showing a cursor.\n"
@@ -2044,6 +2087,8 @@ void print_help(int mode) {
 "                       nodebug_tiles   disable -debug_tiles\n"
 "                       debug_grabs     enable  -debug_grabs\n"
 "                       nodebug_grabs   disable -debug_grabs\n"
+"                       debug_sel       enable  -debug_sel\n"
+"                       nodebug_sel     disable -debug_sel\n"
 "                       dbg             enable  -dbg crash shell\n"
 "                       nodbg           disable -dbg crash shell\n"
 "\n"
@@ -2097,17 +2142,19 @@ void print_help(int mode) {
 "                       nofilexfer deny lock nodeny unlock connect allowonce\n"
 "                       allow localhost nolocalhost listen lookup nolookup\n"
 "                       accept afteraccept gone shm noshm flipbyteorder\n"
-"                       noflipbyteorder onetile noonetile solid_color solid\n"
-"                       nosolid blackout xinerama noxinerama xtrap noxtrap\n"
-"                       xrandr noxrandr xrandr_mode padgeom quiet q noquiet\n"
-"                       modtweak nomodtweak xkb noxkb skip_keycodes sloppy_keys\n"
-"                       nosloppy_keys skip_dups noskip_dups add_keysyms\n"
-"                       noadd_keysyms clear_mods noclear_mods clear_keys\n"
-"                       noclear_keys remap repeat norepeat fb nofb bell\n"
-"                       nobell sel nosel primary noprimary seldir cursorshape\n"
-"                       nocursorshape cursorpos nocursorpos cursor show_cursor\n"
-"                       noshow_cursor nocursor arrow xfixes noxfixes xdamage\n"
-"                       noxdamage xd_area xd_mem alphacut alphafrac alpharemove\n"
+"                       noflipbyteorder onetile noonetile solid_color\n"
+"                       solid nosolid blackout xinerama noxinerama xtrap\n"
+"                       noxtrap xrandr noxrandr xrandr_mode padgeom quiet q\n"
+"                       noquiet modtweak nomodtweak xkb noxkb skip_keycodes\n"
+"                       sloppy_keys nosloppy_keys skip_dups noskip_dups\n"
+"                       add_keysyms noadd_keysyms clear_mods noclear_mods\n"
+"                       clear_keys noclear_keys remap repeat norepeat fb nofb\n"
+"                       bell nobell sel nosel primary noprimary setprimary\n"
+"                       nosetprimary clipboard noclipboard setclipboard\n"
+"                       nosetclipboard seldir cursorshape nocursorshape\n"
+"                       cursorpos nocursorpos cursor show_cursor noshow_cursor\n"
+"                       nocursor arrow xfixes noxfixes xdamage noxdamage\n"
+"                       xd_area xd_mem alphacut alphafrac alpharemove\n"
 "                       noalpharemove alphablend noalphablend xwarppointer\n"
 "                       xwarp noxwarppointer noxwarp buttonmap dragging\n"
 "                       nodragging wireframe_mode wireframe wf nowireframe\n"