{iiop,uiop}loc should not be accepted as a proper prefix for

server endpoints.

2 files changed, 3 insertions, 9 deletions

diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp
index cfcc66f5f7b..cfb0039d019 100644
--- a/TAO/tao/IIOP_Factory.cpp
+++ b/TAO/tao/IIOP_Factory.cpp
@@ -22,13 +22,8 @@ TAO_IIOP_Protocol_Factory::~TAO_IIOP_Protocol_Factory (void)
 int
 TAO_IIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
 {
-  const char *protocol[] = { "iiop", "iioploc" };
-  // This is valid for any protocol beginning with `iiop' or `iioploc'.
-
-  // Check for the proper prefix in the IOR.  If the proper prefix isn't
-  // in the IOR then it is not an IOR we can use.
-  return (ACE_OS::strcasecmp (prefix.c_str (), protocol[0]) == 0 ||
-          ACE_OS::strcasecmp (prefix.c_str (), protocol[1]) == 0);
+  // Check for the proper prefix for this protocol.
+  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
 }
 
 const char *
diff --git a/TAO/tao/UIOP_Factory.cpp b/TAO/tao/UIOP_Factory.cpp
index c69a3bdba06..f1d5734740a 100644
--- a/TAO/tao/UIOP_Factory.cpp
+++ b/TAO/tao/UIOP_Factory.cpp
@@ -26,8 +26,7 @@ TAO_UIOP_Protocol_Factory::~TAO_UIOP_Protocol_Factory (void)
 int
 TAO_UIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
 {
-  // Check for the proper prefix in the IOR.  If the proper prefix isn't
-  // in the IOR then it is not an IOR we can use.
+  // Check for the proper prefix for this protocol.
   return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
 }