summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2019-07-16 10:09:12 -0400
committerMichael R Sweet <michael.r.sweet@gmail.com>2019-07-16 10:09:12 -0400
commit242b4b9be6e22a6cdc7e2b133d0204de03d2b2eb (patch)
tree1031f682b574c89194f5aa3cee209405c9d80651 /doc
parent9539c53065170e97836503074e770d7b5fbf9f83 (diff)
downloadcups-242b4b9be6e22a6cdc7e2b133d0204de03d2b2eb.tar.gz
Update the cupsd.conf man page to better explain what @IF(name) and @LOCAL do
(Issue #5604)
Diffstat (limited to 'doc')
-rw-r--r--doc/help/man-cupsd.conf.html7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 10101dbbe..1668eee8a 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -457,6 +457,8 @@ The following directives may be placed inside Location and Limit sections in the
<dd style="margin-left: 5.0em"><dt><b>Allow @IF(</b><i>name</i><b>)</b>
<dd style="margin-left: 5.0em"><dt><b>Allow @LOCAL</b>
<dd style="margin-left: 5.0em">Allows access from the named hosts, domains, addresses, or interfaces.
+The @IF(name) form uses the current subnets configured for the named interface.
+The @LOCAL form uses the current subnets configured for all interfaces that are not point-to-point, for example Ethernet and Wi-Fi interfaces are used but DSL and VPN interfaces are not.
The Order directive controls whether Allow lines are evaluated before or after Deny lines.
<dt><b>AuthType None</b>
<dd style="margin-left: 5.0em"><dt><b>AuthType Basic</b>
@@ -476,6 +478,8 @@ The value "Default" corresponds to the DefaultAuthType value.
<dd style="margin-left: 5.0em"><dt><b>Deny @IF(</b><i>name</i><b>)</b>
<dd style="margin-left: 5.0em"><dt><b>Deny @LOCAL</b>
<dd style="margin-left: 5.0em">Denies access from the named hosts, domains, addresses, or interfaces.
+The @IF(name) form uses the current subnets configured for the named interface.
+The @LOCAL form uses the current subnets configured for all interfaces that are not point-to-point, for example Ethernet and Wi-Fi interfaces are used but DSL and VPN interfaces are not.
The Order directive controls whether Deny lines are evaluated before or after Allow lines.
<dt><b>Encryption IfRequested</b>
<dd style="margin-left: 5.0em"><dt><b>Encryption Never</b>
@@ -585,6 +589,9 @@ On Linux this is typically done using the
command, while on macOS the
<b>launchctl</b>(8)
command is used instead.
+<p>The @LOCAL macro name can be confusing since the system running
+<b>cupsd</b>
+often belongs to a different set of subnets from its clients.
<h2 class="title"><a name="CONFORMING_TO">Conforming To</a></h2>
The <b>cupsd.conf</b> file format is based on the Apache HTTP Server configuration file format.
<h2 class="title"><a name="EXAMPLES">Examples</a></h2>