summaryrefslogtreecommitdiffstats
path: root/x11vnc/help.c
diff options
context:
space:
mode:
Diffstat (limited to 'x11vnc/help.c')
-rw-r--r--x11vnc/help.c29
1 files changed, 19 insertions, 10 deletions
diff --git a/x11vnc/help.c b/x11vnc/help.c
index c66c10d..e751aeb 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -513,8 +513,10 @@ void print_help(int mode) {
"-unixpw [list] Use Unix username and password authentication. x11vnc\n"
" uses the su(1) program to verify the user's password.\n"
" [list] is an optional comma separated list of allowed\n"
-" Unix usernames. See below for per-user options that\n"
-" can be applied.\n"
+" Unix usernames. If the [list] string begins with the\n"
+" character \"!\" then the entire list is taken as an\n"
+" exclude list. See below for per-user options that can\n"
+" be applied.\n"
"\n"
" A familiar \"login:\" and \"Password:\" dialog is\n"
" presented to the user on a black screen inside the\n"
@@ -613,11 +615,14 @@ void print_help(int mode) {
" \"deny\", e.g. \"karl,wally:viewonly,boss:input=M\".\n"
" For \"input=\" it is the K,M,B,C described under -input.\n"
"\n"
-" If a user in the list is \"*\" that means those\n"
+" If an item in the list is \"*\" that means those\n"
" options apply to all users. It also means all users\n"
" are allowed to log in after supplying a valid password.\n"
" Use \"deny\" to explicitly deny some users if you use\n"
-" \"*\" to set a global option.\n"
+" \"*\" to set a global option. If [list] begins with\n"
+" the \"!\" character then \"*\" is ignored for checking\n"
+" if the user is allowed, but the any value of options\n"
+" associated with it does apply as normal.\n"
"\n"
" There are also some utilities for testing password\n"
" if [list] starts with the \"%\" character. See the\n"
@@ -656,11 +661,15 @@ void print_help(int mode) {
" line of its stdin will the username and the second line\n"
" the received password. If the command exits with status\n"
" 0 (success) the VNC client will be accepted. It will be\n"
-" rejected for any other return status. Dynamic passwords\n"
-" and non-unix passwords can be implemented this way by\n"
-" providing your own custom helper program. Note that\n"
-" under unixpw mode the remote viewer is given 3 tries\n"
-" to enter the correct password.\n"
+" rejected for any other return status.\n"
+"\n"
+" Dynamic passwords and non-unix passwords can be\n"
+" implemented this way by providing your own custom helper\n"
+" program. Note that under unixpw mode the remote viewer\n"
+" is given 3 tries to enter the correct password.\n"
+"\n"
+" If a list of allowed users is needed use -unixpw [list]\n"
+" in addition to this option.\n"
"\n"
#endif
"-display WAIT:... A special usage mode for the normal -display option.\n"
@@ -2707,7 +2716,7 @@ void print_help(int mode) {
" @WxHxB at the end of the string.\n"
"\n"
" Examples:\n"
-" -rawfb console (same as -rawfb console)\n"
+" -rawfb console\n"
" -rawfb /dev/fb0 (same)\n"
" -rawfb console3 (force /dev/tty3)\n"
" -rawfb consolex (no keystrokes or mouse)\n"