diff options
Diffstat (limited to 'x11vnc/help.c')
| -rw-r--r-- | x11vnc/help.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/x11vnc/help.c b/x11vnc/help.c index bc38787..d4e91a9 100644 --- a/x11vnc/help.c +++ b/x11vnc/help.c @@ -342,6 +342,9 @@ void print_help(int mode) { "\n" "-timeout n Exit unless a client connects within the first n seconds\n" " after startup.\n" +"-sleepin n At startup sleep n seconds before proceeding (e.g. to\n" +" allow redirs and listening clients to start up)\n" +"\n" "-inetd Launched by inetd(8): stdio instead of listening socket.\n" " Note: if you are not redirecting stderr to a log file\n" " (via shell 2> or -o option) you MUST also specify the -q\n" @@ -643,7 +646,7 @@ void print_help(int mode) { " the same as requiring a Unix user login (since a Unix\n" " password or the user's public key authentication is\n" " used by sshd on the machine where x11vnc runs and only\n" -" local connections from that machine are accepted)\n" +" local connections from that machine are accepted).\n" "\n" " Set UNIXPW_DISABLE_LOCALHOST=1 to disable the -localhost\n" " requirement in Method 2). One should never do this\n" @@ -656,8 +659,11 @@ void print_help(int mode) { " to connect to the same machine x11vnc is running on\n" " (default port 5500). Please use a ssh or stunnel port\n" " redirection to the viewer machine to tunnel the reverse\n" -" connection over an encrypted channel. Note that in -ssl\n" -" mode reverse connection are disabled (see below).\n" +" connection over an encrypted channel.\n" +#if 0 +" Note that in -ssl\n" +" mode reverse connection are disabled (see below). XXX\n" +#endif "\n" " In -inetd mode the Method 1) will be enforced (not\n" " Method 2). With -ssl in effect reverse connections\n" @@ -986,11 +992,13 @@ void print_help(int mode) { "\n" " Example: x11vnc -ssl SAVE -display :0 ...\n" "\n" +#if 0 " Reverse connections are disabled in -ssl mode because\n" " there is no way to ensure that data channel will\n" " be encrypted. Set X11VNC_SSL_ALLOW_REVERSE=1 to\n" " override this.\n" "\n" +#endif " Your VNC viewer will also need to be able to connect\n" " via SSL. See the discussion below under -stunnel and\n" " the FAQ (ss_vncviewer script) for how this might be\n" |