From: Pierre Ossman Date: Mon, 10 Aug 2015 09:31:14 +0000 (+0200) Subject: Change netmask to prefix in ACL documentation X-Git-Tag: v1.5.90~49 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=14e214f10b9de6869695b526da42681b31af416c;p=tigervnc.git Change netmask to prefix in ACL documentation The IPv6 additions deprecated support for netmasks in the access control lists. Unfortunately some documentation was not updated to reflect this fact. --- diff --git a/unix/x0vncserver/x0vncserver.man b/unix/x0vncserver/x0vncserver.man index 87fedf30..095f6db3 100644 --- a/unix/x0vncserver/x0vncserver.man +++ b/unix/x0vncserver/x0vncserver.man @@ -68,14 +68,13 @@ output. .B HostsFile This parameter allows to specify a file name with IP access control rules. The file should include one rule per line, and the rule format is one of the -following: +\fIaddress\fP/\fInetmask\fP (accept connections from the -specified address group), -\fIaddress\fP/\fInetmask\fP (reject connections) -or ?\fIaddress\fP/\fInetmask\fP (query the local user). The first rule +following: +\fIaddress\fP/\fIprefix\fP (accept connections from the +specified address group), -\fIaddress\fP/\fIprefix\fP (reject connections) +or ?\fIaddress\fP/\fIprefix\fP (query the local user). The first rule matching the IP address determines the action to be performed. Rules that include only an action sign (+, - or ?) will match any IP address. -\fINetmask\fP is optional and can be specified either in dotted format -(e.g. /255.255.255.0), or as a single number of bits (e.g. /24). Default is -to accept connections from any IP address. +\fIPrefix\fP is optional and is specified as a number of bits (e.g. /24). +Default is to accept connections from any IP address. . .TP .B SecurityTypes diff --git a/win/vncconfig/vncconfig.rc b/win/vncconfig/vncconfig.rc index b49d7440..49585b4c 100644 --- a/win/vncconfig/vncconfig.rc +++ b/win/vncconfig/vncconfig.rc @@ -179,7 +179,7 @@ BEGIN CONTROL "Query",IDC_QUERY,"Button",BS_AUTORADIOBUTTON,7,35,53,15 DEFPUSHBUTTON "OK",IDOK,115,35,50,15 PUSHBUTTON "Cancel",IDCANCEL,170,35,50,15 - LTEXT "e.g. 192.168.0.0/255.255.0.0",IDC_STATIC,65,20,100,15 + LTEXT "e.g. 192.168.0.0/16",IDC_STATIC,65,20,100,15 END IDD_SHARING DIALOG DISCARDABLE 0, 0, 186, 95