Commit 2398655d authored by Daniel Salzman's avatar Daniel Salzman

conf: rename acl.action value xfer to transfer

parent 1a6f7db4
......@@ -92,7 +92,7 @@ network subnet. Also a TSIG key can be specified::
- id: subnet_rule
address: 192.168.2.0/24 # Network subnet
action: xfer # Allow zone transfers
action: transfer # Allow zone transfers
- id: deny_rule
address: 192.168.2.100 # Negative match
......@@ -100,7 +100,7 @@ network subnet. Also a TSIG key can be specified::
- id: key_rule
key: key1 # Access based just on TSIG key
action: xfer
action: transfer
These rules can then be referenced from a zone :ref:`template_acl`::
......@@ -163,7 +163,7 @@ configured in a proper ACL rule::
Master zone
===========
An ACL with the ``xfer`` action must be configured to allow outgoing zone
An ACL with the ``transfer`` action must be configured to allow outgoing zone
transfers. An ACL rule consists of a single address or a network subnet::
remote:
......@@ -173,11 +173,11 @@ transfers. An ACL rule consists of a single address or a network subnet::
acl:
- id: slave1_acl
address: 192.168.2.1
action: xfer
action: transfer
- id: others_acl
address: 192.168.3.0/24
action: xfer
action: transfer
zone:
- domain: example.com
......@@ -202,11 +202,11 @@ Optionally a TSIG key can be specified::
- id: slave1_acl
address: 192.168.2.1
key: slave1_key
action: xfer
action: transfer
- id: others_acl
address: 192.168.3.0/24
action: xfer
action: transfer
Dynamic updates
===============
......
......@@ -307,7 +307,7 @@ acl:
\- id: STR
address: ADDR[/INT]
key: key_id
action: deny | xfer | notify | update ...
action: deny | transfer | notify | update ...
.ft P
.fi
.UNINDENT
......@@ -335,7 +335,7 @@ Possible values:
.IP \(bu 2
\fBdeny\fP \- Block the matching query
.IP \(bu 2
\fBxfer\fP \- Allow zone transfer
\fBtransfer\fP \- Allow zone transfer
.IP \(bu 2
\fBnotify\fP \- Allow incoming notify
.IP \(bu 2
......
......@@ -359,7 +359,7 @@ Access control list rules definition.
- id: STR
address: ADDR[/INT]
key: key_id
action: deny | xfer | notify | update ...
action: deny | transfer | notify | update ...
.. _acl_id:
......@@ -397,7 +397,7 @@ An ordered list of allowed actions.
Possible values:
- ``deny`` - Block the matching query
- ``xfer`` - Allow zone transfer
- ``transfer`` - Allow zone transfer
- ``notify`` - Allow incoming notify
- ``update`` - Allow zone updates
......
......@@ -49,7 +49,7 @@ static const lookup_table_t key_algs[] = {
static const lookup_table_t acl_actions[] = {
{ ACL_ACTION_DENY, "deny" },
{ ACL_ACTION_XFER, "xfer" },
{ ACL_ACTION_XFER, "transfer" },
{ ACL_ACTION_NOTF, "notify" },
{ ACL_ACTION_DDNS, "update" },
{ 0, NULL }
......
......@@ -337,9 +337,9 @@ static void acl_end(void *scanner)
static bool is_acl(void *scanner, const char *str) {
conf_extra_t *extra = cf_get_extra(scanner);
return hattrie_tryget(extra->share->acl_xfer, str, strlen(str)) != NULL ||
hattrie_tryget(extra->share->acl_notify, str, strlen(str)) != NULL ||
hattrie_tryget(extra->share->acl_update, str, strlen(str)) != NULL;
return hattrie_tryget(extra->share->acl_xfer, str, strlen(str)) != NULL ||
hattrie_tryget(extra->share->acl_notify, str, strlen(str)) != NULL ||
hattrie_tryget(extra->share->acl_update, str, strlen(str)) != NULL;
}
static bool have_acl(void *scanner) {
......@@ -360,7 +360,7 @@ static char *acl_actions(void *scanner, const char *str) {
if (hattrie_tryget(extra->share->acl_xfer, str, strlen(str)) != NULL) {
strlcat(actions, _first ? "" : ", ", sizeof(actions)); _first = false;
strlcat(actions, "xfer", sizeof(actions));
strlcat(actions, "transfer", sizeof(actions));
}
if (hattrie_tryget(extra->share->acl_notify, str, strlen(str)) != NULL) {
strlcat(actions, _first ? "" : ", ", sizeof(actions)); _first = false;
......
......@@ -281,9 +281,9 @@ static void acl_end(void *scanner)
static bool is_acl(void *scanner, const char *str) {
conf_extra_t *extra = cf_get_extra(scanner);
return hattrie_tryget(extra->share->acl_xfer, str, strlen(str)) != NULL ||
hattrie_tryget(extra->share->acl_notify, str, strlen(str)) != NULL ||
hattrie_tryget(extra->share->acl_update, str, strlen(str)) != NULL;
return hattrie_tryget(extra->share->acl_xfer, str, strlen(str)) != NULL ||
hattrie_tryget(extra->share->acl_notify, str, strlen(str)) != NULL ||
hattrie_tryget(extra->share->acl_update, str, strlen(str)) != NULL;
}
static bool have_acl(void *scanner) {
......@@ -304,7 +304,7 @@ static char *acl_actions(void *scanner, const char *str) {
if (hattrie_tryget(extra->share->acl_xfer, str, strlen(str)) != NULL) {
strlcat(actions, _first ? "" : ", ", sizeof(actions)); _first = false;
strlcat(actions, "xfer", sizeof(actions));
strlcat(actions, "transfer", sizeof(actions));
}
if (hattrie_tryget(extra->share->acl_notify, str, strlen(str)) != NULL) {
strlcat(actions, _first ? "" : ", ", sizeof(actions)); _first = false;
......
......@@ -867,13 +867,13 @@ class Knot(Server):
s.item_str("address", self.addr)
if self.tsig:
s.item_str("key", self.tsig.name)
s.item("action", "[xfer, notify, update]")
s.item("action", "[transfer, notify, update]")
s.id_item("id", "acl_test")
s.item_str("address", self.addr)
if self.tsig_test:
s.item_str("key", self.tsig_test.name)
s.item("action", "[xfer, notify, update]")
s.item("action", "[transfer, notify, update]")
servers = set() # Duplicity check.
for zone in sorted(self.zones):
......@@ -892,7 +892,7 @@ class Knot(Server):
s.item_str("address", slave.addr)
if slave.tsig:
s.item_str("key", slave.tsig.name)
s.item("action", "xfer")
s.item("action", "transfer")
servers.add(slave.name)
s.end()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment