minor doc fixes
diff --git a/docs/book/src/cpp-broker/Security.xml b/docs/book/src/cpp-broker/Security.xml
index 8f42e6a..17bd7b0 100644
--- a/docs/book/src/cpp-broker/Security.xml
+++ b/docs/book/src/cpp-broker/Security.xml
@@ -374,10 +374,10 @@
<programlisting>
group admin ted@QPID martin@QPID
- group blacklist usera@qpid userb@qpid
+ group blockedlist usera@qpid userb@qpid
quota connections 10 admin
quota connections 5 all
- quota connections 0 blacklist
+ quota connections 0 blockedlist
quota queues 50 admin
quota queues 5 all
quota queues 1 test@qpid
@@ -1705,7 +1705,7 @@
<para>
The next illustration shows the Debug-level log. Debug log level includes information about
constructing the rule tables, expanding groups and keywords, connection and queue quotas, and
- connection black and white lists.
+ connection blocked and approved lists.
</para>
<programlisting>
notice ACL: Read file "/home/chug/acl/svn-acl.acl"
diff --git a/src/qpid/acl/AclConnectionCounter.cpp b/src/qpid/acl/AclConnectionCounter.cpp
index ca3da50..1e8b781 100644
--- a/src/qpid/acl/AclConnectionCounter.cpp
+++ b/src/qpid/acl/AclConnectionCounter.cpp
@@ -226,7 +226,7 @@
(void) countConnectionLH(connectProgressMap, connection.getMgmtId(),
C_OPENED, false, false);
- // Run global black/white list check
+ // Run global deny/allow list check
sys::SocketAddress sa(hostName, "");
bool okByHostList(true);
std::string hostLimitText;
diff --git a/src/qpid/acl/AclData.cpp b/src/qpid/acl/AclData.cpp
index a629e44..d219b53 100644
--- a/src/qpid/acl/AclData.cpp
+++ b/src/qpid/acl/AclData.cpp
@@ -693,7 +693,7 @@
}
}
- // Run user black/white list check
+ // Run user deny/allow list check
if (!decisionMade) {
bwHostUserRuleMapItr itrRule = connBWHostsUserRules->find(userName);
if (itrRule != connBWHostsUserRules->end()) {
diff --git a/src/qpid/acl/AclData.h b/src/qpid/acl/AclData.h
index 105a5d9..bc7a384 100644
--- a/src/qpid/acl/AclData.h
+++ b/src/qpid/acl/AclData.h
@@ -31,7 +31,7 @@
namespace qpid {
namespace acl {
-/** A rule for tracking black/white host connection settings.
+/** A rule for tracking deny/allow host connection settings.
* When a connection is attempted, the remote host is verified
* against lists of these rules. When the remote host is in
* the range specified by this aclHost then the AclResult is
@@ -238,10 +238,10 @@
bool enforcingQueueQuotas() const { return queueQuotaRuleSettings->size() > 0; }
bool getQueueQuotaForUser(const std::string&, uint16_t*) const;
- // Global connection Black/White list rules
+ // Global connection Deny/Allow list rules
void setConnGlobalRules (boost::shared_ptr<bwHostRuleSet>);
- // Per-user connection Black/White list rules map
+ // Per-user connection Deny/Allow list rules map
void setConnUserRules (boost::shared_ptr<bwHostUserRuleMap>);
/** getConnectMaxSpec
@@ -311,10 +311,10 @@
// Per-user queue quota
boost::shared_ptr<quotaRuleSet> queueQuotaRuleSettings;
- // Global host connection black/white rule set
+ // Global host connection deny/allow rule set
boost::shared_ptr<bwHostRuleSet> connBWHostsGlobalRules;
- // Per-user host connection black/white rule set map
+ // Per-user host connection deny/allow rule set map
boost::shared_ptr<bwHostUserRuleMap> connBWHostsUserRules;
};
