modifying property name a bit

4 files changed, 21 insertions, 21 deletions

diff --git a/cpp/src/Glacier2/ProxyVerifier.cpp b/cpp/src/Glacier2/ProxyVerifier.cpp
index 8028448ff10..05826d81434 100644
--- a/cpp/src/Glacier2/ProxyVerifier.cpp
+++ b/cpp/src/Glacier2/ProxyVerifier.cpp
@@ -167,8 +167,8 @@ Glacier2::ProxyVerifier::ProxyVerifier(const CommunicatorPtr& communicator, cons
     {
 	_rejectRules.push_back(new MaxEndpointsRule(communicator, s, _traceLevel));
     }
-    _rejectOverrides =
-	communicator->getProperties()->getPropertyAsIntWithDefault("Glacier2.Filter.Regex.Order", 0) == 0;
+    _acceptOverrides =
+	communicator->getProperties()->getPropertyAsIntWithDefault("Glacier2.Filter.Regex.AcceptOverride", 0) != 0;
 }
 
 Glacier2::ProxyVerifier::~ProxyVerifier()
@@ -213,15 +213,15 @@ Glacier2::ProxyVerifier::verify(const ObjectPrx& proxy)
     else
     {
 	//
-	// _rejectOverrides indicates that any accept rules can be
+	// _acceptOverrides indicates that any accept rules can be
 	// overriden by a reject rule. This allows the user to refine
 	// the allow filter's without having to specify exclusions in
 	// the accept filter's regular expression. Conversely if
-	// rejectOverrides is not set then accept rules are allowed to
+	// _acceptOverrides is not set then accept rules are allowed to
 	// override any reject rules that match.
 	//
 	// Note that there is implicit additional meaning in the
-	// _rejectOverrides. If true, then the overall evaluation
+	// _acceptOverrides. If true, then the overall evaluation
 	// context is 'default reject'. Otherwise there would be no
 	// point in considering the allow filters and we might as well
 	// just check the reject filters. Conversely, if false then
@@ -229,31 +229,31 @@ Glacier2::ProxyVerifier::verify(const ObjectPrx& proxy)
 	// filters would be meaningless, only the reject filters would
 	// matter.
 	//
-	if(_rejectOverrides)
+	if(_acceptOverrides)
 	{
-	    result = match(_acceptRules, proxy);
-	    
 	    //
-	    // In this context we are default reject, there is no point
-	    // of running the reject filters if there is no accept
+	    // In this context we are default accept, there is not point
+	    // of running the accept filters if there is no rejection
 	    // match.
 	    //
-	    if(result)
+	    result = !match(_rejectRules, proxy);
+	    if(!result)
 	    {
-		result = !match(_rejectRules, proxy);
+		result = match(_acceptRules, proxy);
 	    }
 	}
 	else
 	{
+	    result = match(_acceptRules, proxy);
+	    
 	    //
-	    // In this context we are default accept, there is not point
-	    // of running the accept filters if there is no rejection
+	    // In this context we are default reject, there is no point
+	    // of running the reject filters if there is no accept
 	    // match.
 	    //
-	    result = !match(_rejectRules, proxy);
-	    if(!result)
+	    if(result)
 	    {
-		result = match(_acceptRules, proxy);
+		result = !match(_rejectRules, proxy);
 	    }
 	}
     }
diff --git a/cpp/src/Glacier2/ProxyVerifier.h b/cpp/src/Glacier2/ProxyVerifier.h
index 5045ec7a5e6..16b132382c3 100644
--- a/cpp/src/Glacier2/ProxyVerifier.h
+++ b/cpp/src/Glacier2/ProxyVerifier.h
@@ -50,7 +50,7 @@ private:
 
     std::vector<ProxyRule*> _acceptRules;
     std::vector<ProxyRule*> _rejectRules;
-    bool _rejectOverrides;
+    bool _acceptOverrides;
 };
 
 }
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 6916ca4d50f..ab312ead6ba 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 May  2 10:18:08 2006
+// Generated by makeprops.py from file `../config/PropertyNames.def', Tue May  2 13:21:23 2006
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -283,7 +283,7 @@ const char* IceInternal::PropertyNames::Glacier2Props[] =
     "Glacier2.Client.Trace.Request",
     "Glacier2.Filter.Regex.Reject",
     "Glacier2.Filter.Regex.Accept",
-    "Glacier2.Filter.Regex.Order",
+    "Glacier2.Filter.Regex.AcceptOverride",
     "Glacier2.Filter.MaxProxyLength",
     "Glacier2.CryptPasswords",
     "Glacier2.InstanceName",
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 4d4c707ae4e..013b03f5f40 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 May  2 10:18:08 2006
+// Generated by makeprops.py from file `../config/PropertyNames.def', Tue May  2 13:21:23 2006
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!