summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorBrent Eagles <brent@zeroc.com>2006-05-01 14:14:46 +0000
committerBrent Eagles <brent@zeroc.com>2006-05-01 14:14:46 +0000
commit60306b3025f7598a96fbdb16670854bcdf133686 (patch)
tree255a36e8fdac5d5911865cceec17afa53a0355ad /cpp/src
parentAdding a note about performance of binary_search vs. regexec (diff)
downloadice-60306b3025f7598a96fbdb16670854bcdf133686.tar.bz2
ice-60306b3025f7598a96fbdb16670854bcdf133686.tar.xz
ice-60306b3025f7598a96fbdb16670854bcdf133686.zip
modifying glacier2 proxy filtering property names
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Glacier2/ProxyVerifier.cpp6
-rw-r--r--cpp/src/Ice/PropertyNames.cpp8
-rw-r--r--cpp/src/Ice/PropertyNames.h2
3 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/Glacier2/ProxyVerifier.cpp b/cpp/src/Glacier2/ProxyVerifier.cpp
index 89eaad2bcc9..baa9e880889 100644
--- a/cpp/src/Glacier2/ProxyVerifier.cpp
+++ b/cpp/src/Glacier2/ProxyVerifier.cpp
@@ -135,19 +135,19 @@ Glacier2::ProxyVerifier::ProxyVerifier(const CommunicatorPtr& communicator, cons
// Evaluation order is dependant on how the rules are stored to the
// rules vectors.
//
- string s = communicator->getProperties()->getProperty("Glacier2.Client.AddProxy.Accept");
+ string s = communicator->getProperties()->getProperty("Glacier2.Client.Filter.Regex.Accept");
if(s != "")
{
_acceptRules.push_back(new RegexRule(communicator, s, _traceLevel));
}
- s = communicator->getProperties()->getProperty("Glacier2.Client.AddProxy.Reject");
+ s = communicator->getProperties()->getProperty("Glacier2.Client.Filter.Regex.Reject");
if(s != "")
{
_rejectRules.push_back(new RegexRule(communicator, s, _traceLevel));
}
- s = communicator->getProperties()->getProperty("Glacier2.Client.AddProxy.MaxEndpoints");
+ s = communicator->getProperties()->getProperty("Glacier2.Client.Filter.MaxProxyLength");
if(s != "")
{
_rejectRules.push_back(new MaxEndpointsRule(communicator, s, _traceLevel));
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 002e9720f4a..553aacfab9a 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -7,7 +7,7 @@
//
// **********************************************************************
-// Generated by makeprops.py from file `../config/PropertyNames.def', Tue Apr 25 16:28:52 2006
+// Generated by makeprops.py from file `../config/PropertyNames.def', Mon May 1 11:37:21 2006
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -281,9 +281,9 @@ const char* IceInternal::PropertyNames::Glacier2Props[] =
"Glacier2.Client.Trace.Override",
"Glacier2.Client.Trace.Reject",
"Glacier2.Client.Trace.Request",
- "Glacier2.Client.AddProxy.Reject",
- "Glacier2.Client.AddProxy.Accept",
- "Glacier2.Client.AddProxy.MaxEndpoints",
+ "Glacier2.Client.Filter.Regex.Reject",
+ "Glacier2.Client.Filter.Regex.Accept",
+ "Glacier2.Client.Filter.MaxProxyLength",
"Glacier2.CryptPasswords",
"Glacier2.InstanceName",
"Glacier2.PermissionsVerifier",
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 9f72cdaad0d..2ea2f42f720 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -7,7 +7,7 @@
//
// **********************************************************************
-// Generated by makeprops.py from file `../config/PropertyNames.def', Tue Apr 25 16:28:52 2006
+// Generated by makeprops.py from file `../config/PropertyNames.def', Mon May 1 11:37:21 2006
// IMPORTANT: Do not edit this file -- any edits made here will be lost!