ChangeLogTag: Wed Nov 8 17:49:25 2000 Balachandran Natarajan <bala@cs.wustl.edu>

5 files changed, 135 insertions, 108 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 76b50dfd33d..c1e1b4fd95a 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,19 @@
+Wed Nov  8 17:49:25 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* tao/GIOP_Message_Accept_State.cpp :
+	* tao/GIOP_Message_Connectors.cpp:
+	* tao/TAO_Server_Request.h:
+	* tao/TAO_Server_Request.i: Made the following minor changes in
+	  accordance with the CORBA 2.4 spec. 
+	  
+	  (1) The CORBA::Principal in the GIOP 1.0 & GIOP 1.1 request
+	  header is now changed to CORBA::OctetSeq in the CORBA 2.4
+	  spec. This change has been incorporated.
+
+	  (2) Finally, the response_flags field in the request header has
+	  been well defined for the Sync Scope in the Messaging spec. The
+	  changes have also been incorporated.
+
 Wed Nov  8 11:05:37 2000  Darrell Brunsch <brunsch@uci.edu>
 
         * TAOACE.dsw:
diff --git a/TAO/tao/GIOP_Message_Accept_State.cpp b/TAO/tao/GIOP_Message_Accept_State.cpp
index c4280684293..0dc42b409af 100644
--- a/TAO/tao/GIOP_Message_Accept_State.cpp
+++ b/TAO/tao/GIOP_Message_Accept_State.cpp
@@ -8,7 +8,7 @@
 #include "tao/GIOP_Utils.h"
 #include "tao/Pluggable_Messaging_Utils.h"
 #include "tao/Tagged_Profile.h"
-
+#include "tao/OctetSeqC.h"
 
 ACE_RCSID(tao, GIOP_Message_Accept_State, "$Id$")
 
@@ -45,31 +45,31 @@ TAO_GIOP_Message_Accept_State::marshal_reply_status (
     }
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_GIOP_Message_Accept_State::unmarshall_object_key (
     TAO_ObjectKey &object_key,
     TAO_InputCDR &input
   )
 {
-  CORBA::Boolean hdr_status = 
+  CORBA::Boolean hdr_status =
     (CORBA::Boolean) input.good_bit ();
-  
+
   CORBA::Long key_length = 0;
   hdr_status = hdr_status && input.read_long (key_length);
 
   if (hdr_status)
     {
-      object_key.replace (key_length, 
+      object_key.replace (key_length,
                           key_length,
                           (CORBA::Octet*)input.rd_ptr (),
                           0);
       input.skip_bytes (key_length);
     }
-  
+
   return hdr_status;
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_GIOP_Message_Accept_State::unmarshall_iop_profile (
     TAO_Tagged_Profile & /* profile */,
     TAO_InputCDR & /* cdr */
@@ -79,7 +79,7 @@ TAO_GIOP_Message_Accept_State::unmarshall_iop_profile (
 }
 
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_GIOP_Message_Accept_State::unmarshall_ref_addr (
     TAO_Tagged_Profile & /* profile */,
     TAO_InputCDR & /* cdr */
@@ -89,7 +89,7 @@ TAO_GIOP_Message_Accept_State::unmarshall_ref_addr (
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// TAO_GIOP_Message_Accept_State_10 methods 
+// TAO_GIOP_Message_Accept_State_10 methods
 ////////////////////////////////////////////////////////////////////////////////
 int
 TAO_GIOP_Message_Accept_State_10::parse_request_header (
@@ -108,12 +108,12 @@ TAO_GIOP_Message_Accept_State_10::parse_request_header (
   // Get the input CDR in the request class
   TAO_InputCDR& input = request.incoming ();
 
-  IOP::ServiceContextList &service_info = 
+  IOP::ServiceContextList &service_info =
     request.service_info ();
-  
+
   input >> service_info;
 
-  CORBA::Boolean hdr_status = 
+  CORBA::Boolean hdr_status =
     (CORBA::Boolean) input.good_bit ();
 
   CORBA::ULong req_id;
@@ -171,16 +171,20 @@ TAO_GIOP_Message_Accept_State_10::parse_request_header (
 
   if (hdr_status)
     {
-      CORBA::Principal_var principal;
+      /**** This has been deprecated in 2.4 ****/
+      /*CORBA::Principal_var principal;
 
-      // Beware extra data copying.
       input >> principal.out ();
 
-      request.requesting_principal (principal.in ());
+      request.requesting_principal (principal.in ()); */
 
+      CORBA_OctetSeq oct_seq;
+      input >> oct_seq;
+      request.requesting_principal (oct_seq);
       hdr_status = (CORBA::Boolean) input.good_bit ();
     }
 
+
   return hdr_status ? 0 : -1;
 }
 
@@ -224,7 +228,7 @@ TAO_GIOP_Message_Accept_State_10::write_reply_header (
 
       // Now increment it to account for the last dummy one...
       count++;
-      
+
       // Now marshal the rest of the service context objects
       output << count;
       for (i = 0; i != l; ++i)
@@ -243,10 +247,10 @@ TAO_GIOP_Message_Accept_State_10::write_reply_header (
     {
       // @@ Much of this code is GIOP 1.1 specific and should be
       ptr_arith_t target = reply.dsi_nvlist_align_;
-      
+
       ptr_arith_t current =
         ptr_arith_t (output.current_alignment ()) % ACE_CDR::MAX_ALIGNMENT;
-      
+
       CORBA::ULong pad = 0;
 
       if (target == 0)
@@ -294,7 +298,7 @@ TAO_GIOP_Message_Accept_State_10::write_reply_header (
           ACE_THROW_RETURN (CORBA::MARSHAL (),
                             0);
         }
-      
+
       output << CORBA::ULong (TAO_SVC_CONTEXT_ALIGN);
       output << pad;
 
@@ -304,12 +308,12 @@ TAO_GIOP_Message_Accept_State_10::write_reply_header (
         }
     }
 #endif /* TAO_HAS_MINIMUM_CORBA */
-  
+
   // Write the request ID
   output.write_ulong (reply.request_id_);
 
   // Write the reply status
-  this->marshal_reply_status (output, 
+  this->marshal_reply_status (output,
                               reply);
 
   ACE_UNUSED_ARG (ACE_TRY_ENV);
@@ -334,7 +338,7 @@ TAO_GIOP_Message_Accept_State_10::parse_locate_header (
   request.request_id (req_id);
 
   // Get the object key
-  hdr_status = 
+  hdr_status =
     this->unmarshall_object_key (request.object_key (),
                                  msg);
 
@@ -354,7 +358,7 @@ TAO_GIOP_Message_Accept_State_10::write_locate_reply_mesg (
 
   if (status_info.status == TAO_GIOP_OBJECT_FORWARD)
     {
-      CORBA::Object_ptr object_ptr = 
+      CORBA::Object_ptr object_ptr =
         status_info.forward_location_var.in ();
 
       if ((output << object_ptr) == 0)
@@ -396,7 +400,7 @@ TAO_GIOP_Message_Accept_State_11::minor_version (void)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// TAO_GIOP_Message_Accept_State_12 methods 
+// TAO_GIOP_Message_Accept_State_12 methods
 ////////////////////////////////////////////////////////////////////////////////
 
 // The methods below are not complete.
@@ -408,24 +412,23 @@ TAO_GIOP_Message_Accept_State_12::parse_request_header (
 
   // Get the input CDR in the request class
   TAO_InputCDR& input = request.incoming ();
-  
+
   CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit ();
 
-  CORBA::ULong req_id; 
+  CORBA::ULong req_id;
   // Get the rest of the request header ...
   hdr_status = hdr_status && input.read_ulong (req_id);
-  
+
   request.request_id (req_id);
-  
+
   CORBA::Octet response_flags;
   hdr_status = hdr_status && input.read_octet (response_flags);
-  
-  // Need to work around the hacks
-  request.response_expected ((response_flags > 1));
+
+  request.response_expected ((response_flags > 0));
 
   // The high bit of the octet has been set if the SyncScope policy
-  // value is SYNC_WITH_SERVER. 
-  request.sync_with_server ((response_flags == 2));
+  // value is SYNC_WITH_SERVER.
+  request.sync_with_server ((response_flags == 1));
 
   // Reserved field
   input.skip_bytes (3);
@@ -438,19 +441,19 @@ TAO_GIOP_Message_Accept_State_12::parse_request_header (
     {
       if (disc == GIOP::KeyAddr)
           {
-            hdr_status = 
+            hdr_status =
               this->unmarshall_object_key (request.object_key (),
                                            input);
           }
        else if (disc == GIOP::ProfileAddr)
           {
-            hdr_status = 
+            hdr_status =
               this->unmarshall_iop_profile (request.profile (),
                                             input);
           }
       else if (disc == GIOP::ReferenceAddr)
         {
-             hdr_status = 
+             hdr_status =
                this->unmarshall_ref_addr (request.profile (),
                                           input);
         }
@@ -496,14 +499,14 @@ TAO_GIOP_Message_Accept_State_12::parse_request_header (
   // verify a digital signature, if that is required in this security
   // environment.  It may be required even when using IPSEC security
   // infrastructure.
-  IOP::ServiceContextList &service_info = 
+  IOP::ServiceContextList &service_info =
     request.service_info ();
-  
+
   input >> service_info;
 
   // Reset the read_ptr to an 8-byte boundary.
   input.align_read_ptr (TAO_GIOP_MESSAGE_ALIGN_PTR);
-  
+
   return hdr_status ? 0 : -1;
 }
 
@@ -516,86 +519,86 @@ TAO_GIOP_Message_Accept_State_12::parse_locate_header (
   TAO_InputCDR &msg = request.incoming_stream ();
 
   CORBA::Boolean hdr_status = 1;
-  
+
   // Get the request id.
   CORBA::ULong req_id = 0;
   hdr_status = msg.read_ulong (req_id);
-  
+
   // Store it in the Locate request classes
   request.request_id (req_id);
 
   // Read the discriminant of the union.
   CORBA::Short disc = 0;
-  hdr_status = 
+  hdr_status =
     hdr_status && msg.read_short (disc);
 
   if (hdr_status)
     {
       if (disc == GIOP::KeyAddr)
           {
-            hdr_status = 
+            hdr_status =
               this->unmarshall_object_key (request.object_key (),
                                            msg);
           }
        else if (disc == GIOP::ProfileAddr)
           {
-            hdr_status = 
+            hdr_status =
               this->unmarshall_iop_profile (request.profile (),
                                             msg);
           }
       else if (disc == GIOP::ReferenceAddr)
         {
-             hdr_status = 
+             hdr_status =
                this->unmarshall_ref_addr (request.profile (),
                                           msg);
         }
     }
-  
+
   // Reset the pointer to an 8-byte bouns]dary
   msg.align_read_ptr (TAO_GIOP_MESSAGE_ALIGN_PTR);
 
   return hdr_status ? 0 : -1;
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_GIOP_Message_Accept_State_12::unmarshall_iop_profile (
     TAO_Tagged_Profile &profile_addr,
     TAO_InputCDR &input
   )
 {
-  CORBA::Boolean hdr_status = 
+  CORBA::Boolean hdr_status =
     (CORBA::Boolean) input.good_bit ();
 
   // Get the IOP::Tagged profile.
-  IOP::TaggedProfile &tagged_profile = 
+  IOP::TaggedProfile &tagged_profile =
     profile_addr.tagged_profile ();
-    
+
   hdr_status &= input >> tagged_profile;
-  
+
   // Extract the object key from the TaggedProfile.
   hdr_status &=profile_addr.extract_object_key (tagged_profile);
 
   return hdr_status;
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_GIOP_Message_Accept_State_12::unmarshall_ref_addr (
     TAO_Tagged_Profile &profile_addr,
     TAO_InputCDR &input
   )
 {
-  CORBA::Boolean hdr_status = 
+  CORBA::Boolean hdr_status =
     (CORBA::Boolean) input.good_bit ();
 
     // Get the IOP::Tagged profile.
-  GIOP::IORAddressingInfo &addr_info = 
+  GIOP::IORAddressingInfo &addr_info =
     profile_addr.addressing_info ();
 
   hdr_status &= input>> addr_info;
 
-  IOP::TaggedProfile &tag = 
+  IOP::TaggedProfile &tag =
     addr_info.ior.profiles [addr_info.selected_profile_index];
-  
+
   // Extract the object key from the TaggedProfile.
   hdr_status &= profile_addr.extract_object_key (tag);
 
@@ -612,9 +615,9 @@ TAO_GIOP_Message_Accept_State_12::write_reply_header (
 {
   // Write the request ID
   output.write_ulong (reply.request_id_);
-  
+
    // Write the reply status
-  if (reply.reply_status_ == 
+  if (reply.reply_status_ ==
       TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM)
     {
       // Not sure when we will use this.
@@ -628,7 +631,7 @@ TAO_GIOP_Message_Accept_State_12::write_reply_header (
     }
   else
     {
-      this->marshal_reply_status (output, 
+      this->marshal_reply_status (output,
                                   reply);
     }
 
@@ -644,7 +647,7 @@ TAO_GIOP_Message_Accept_State_12::write_reply_header (
       IOP::ServiceContextList &svc_ctx =
         reply.service_context_notowned ();
       CORBA::ULong l = svc_ctx.length ();
-      
+
       // Now marshal the rest of the service context objects
       output << l;
 
@@ -655,7 +658,7 @@ TAO_GIOP_Message_Accept_State_12::write_reply_header (
 
     }
 #endif /*TAO_HAS_MINIMUM_CORBA */
-  
+
   if (output.align_write_ptr (TAO_GIOP_MESSAGE_ALIGN_PTR) == -1)
     {
       return 0;
@@ -664,7 +667,7 @@ TAO_GIOP_Message_Accept_State_12::write_reply_header (
   return 1;
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 TAO_GIOP_Message_Accept_State_12::write_locate_reply_mesg (
     TAO_OutputCDR & output,
     CORBA::ULong request_id,
@@ -684,11 +687,11 @@ TAO_GIOP_Message_Accept_State_12::write_locate_reply_mesg (
   switch (status_info.status)
     {
     case TAO_GIOP_OBJECT_FORWARD:
-      
+
       // More likely than not we will not have this in TAO
     case TAO_GIOP_OBJECT_FORWARD_PERM:
       {
-        CORBA::Object_ptr object_ptr = 
+        CORBA::Object_ptr object_ptr =
           status_info.forward_location_var.in ();
 
         if ((output << object_ptr) == 0)
@@ -731,4 +734,3 @@ TAO_GIOP_Message_Accept_State_12::minor_version (void)
 {
   return (CORBA::Octet) 2;
 }
-
diff --git a/TAO/tao/GIOP_Message_Connectors.cpp b/TAO/tao/GIOP_Message_Connectors.cpp
index b9a72f217dd..2a0ceb36a9c 100644
--- a/TAO/tao/GIOP_Message_Connectors.cpp
+++ b/TAO/tao/GIOP_Message_Connectors.cpp
@@ -85,23 +85,23 @@ TAO_GIOP_Message_Connectors::
     {
       // Request completed successfully
     case TAO_GIOP_NO_EXCEPTION:
-      params.reply_status_ = 
+      params.reply_status_ =
         TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION;
       break;
 
       // Request terminated with user exception
     case TAO_GIOP_USER_EXCEPTION:
-      params.reply_status_ = 
+      params.reply_status_ =
         TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION;
       break;
       // Request terminated with system exception
     case TAO_GIOP_SYSTEM_EXCEPTION:
-      params.reply_status_ = 
+      params.reply_status_ =
         TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION;
       break;
       // Reply is a location forward type
     case TAO_GIOP_LOCATION_FORWARD:
-      params.reply_status_ = 
+      params.reply_status_ =
         TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
       break;
       // Reply is a location forward perm type
@@ -110,12 +110,12 @@ TAO_GIOP_Message_Connectors::
       // LOCATION_FORWARD as there is a controversy surrounding the
       // usage of this in the OMG.
     case TAO_GIOP_LOCATION_FORWARD_PERM:
-      params.reply_status_ = 
+      params.reply_status_ =
         TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
       break;
       // Reply is a location forward type
     case TAO_GIOP_NEEDS_ADDRESSING_MODE:
-      params.reply_status_ = 
+      params.reply_status_ =
         TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE;
       break;
     default:
@@ -159,9 +159,9 @@ TAO_GIOP_Message_Connectors::
                     ACE_TEXT ("extracting reply status\n")));
       return -1;
     }
-  
+
   return 0;
-  
+
 }
 
 
@@ -184,7 +184,7 @@ TAO_GIOP_Message_Connectors::validate_version (TAO_GIOP_Message_State *state)
 
 
 int
-TAO_GIOP_Message_Connectors::process_client_message (TAO_Transport * /*transport*/, 
+TAO_GIOP_Message_Connectors::process_client_message (TAO_Transport * /*transport*/,
                                                      TAO_ORB_Core * /*orb_core*/,
                                                      TAO_InputCDR & /*input*/,
                                                      CORBA::Octet /*message_type*/)
@@ -225,7 +225,7 @@ TAO_GIOP_Message_Connector_10::
    // @@ (JP) Temporary hack until all of GIOP 1.2 is implemented.
   if (response_flags == TAO_TWOWAY_RESPONSE_FLAG)
     msg << CORBA::Any::from_octet (1);
-  else 
+  else
     msg << CORBA::Any::from_octet (0);
 
   // In this case we cannot recognise anything other than the Object
@@ -254,8 +254,16 @@ TAO_GIOP_Message_Connector_10::
   // unverified user ID, and then verifying the message (i.e. a dummy
   // service context entry is set up to hold a digital signature for
   // this message, then patched shortly before it's sent).
-  static CORBA::Principal_ptr principal = 0;
-  msg << principal;
+
+  /***** This has been deprecated in the 2.4 spec ******/
+  //static CORBA::Principal_ptr principal = 0;
+  //msg << principal;
+
+  // This is now introduced in 2.4 spec
+  CORBA::OctetSeq req_principal (0);
+  req_principal.length (0);
+  msg << req_principal;
+
 
 
   return 1;
@@ -309,7 +317,7 @@ TAO_GIOP_Message_Connector_10::
     case TAO_GIOP_REQUEST:
       // In GIOP 1.0 and GIOP 1.1 this is an error,
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Connector_10::parse_reply: ") 
+                         ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Connector_10::parse_reply: ")
                          ACE_TEXT ("request.\n")),
                         -1);
 
@@ -388,10 +396,10 @@ TAO_GIOP_Message_Connector_12::
   msg << opdetails.request_id ();
 
   const CORBA::Octet response_flags = opdetails.response_flags ();
-  
+
   // Here are the Octet values for different policies
   // '00000000' for SYNC_NONE
-  // '00000001' for SYNC_WITH_TRANSPORT
+  // '00000000' for SYNC_WITH_TRANSPORT
   // '00000010' for SYNC_WITH_SERVER
   // '00000011' for SYNC_WITH_TARGET
   // '00000011' for regular two ways, but if they are invoked via a
@@ -403,18 +411,15 @@ TAO_GIOP_Message_Connector_12::
   // Second the response flags
   // Sync scope - ignored by server if request is not oneway.
   else if (response_flags == CORBA::Octet (TAO::SYNC_NONE) ||
+           response_flags == CORBA::Octet (TAO::SYNC_WITH_TRANSPORT) ||
            response_flags == CORBA::Octet (TAO::SYNC_EAGER_BUFFERING) ||
            response_flags == CORBA::Octet (TAO::SYNC_DELAYED_BUFFERING))
     // No response required.
     msg << CORBA::Any::from_octet (0);
 
-  else if (response_flags == CORBA::Octet (TAO::SYNC_WITH_TRANSPORT))
-    // Return after receiving message.
-    msg << CORBA::Any::from_octet (1);
-
   else if (response_flags == CORBA::Octet (TAO::SYNC_WITH_SERVER))
     // Return before dispatching to the servant
-    msg << CORBA::Any::from_octet (2);
+    msg << CORBA::Any::from_octet (1);
 
   else if (response_flags == CORBA::Octet (TAO::SYNC_WITH_TARGET))
     // Return after dispatching servant.
@@ -431,11 +436,11 @@ TAO_GIOP_Message_Connector_12::
   if (this->marshall_target_spec (spec,
                                   msg) == 0)
     return 0;
-  
+
   // Write the operation name
-  msg.write_string (opdetails.opname_len (), 
+  msg.write_string (opdetails.opname_len (),
                     opdetails.opname ());
-  
+
   // Write the service context list
   msg << opdetails.service_info ();
 
@@ -455,7 +460,7 @@ TAO_GIOP_Message_Connector_12::
 {
   // Write the request id
   msg << request_id;
-  
+
   // Write the target address
   if (this->marshall_target_spec (spec,
                                   msg) == 0)
@@ -495,7 +500,7 @@ TAO_GIOP_Message_Connector_12::
       {
         // As this is a union send in the discriminant first
         msg << GIOP::KeyAddr;
-        
+
         // Get the object key
         const TAO_ObjectKey *key = spec.object_key ();
         if (key)
@@ -516,10 +521,10 @@ TAO_GIOP_Message_Connector_12::
       {
         // As this is a union send in the discriminant first
         msg << GIOP::ProfileAddr;
-        
+
         // Get the profile
         const IOP::TaggedProfile *pfile = spec.profile ();
-        
+
         if (pfile)
           {
             // Marshall in the object key
@@ -538,16 +543,16 @@ TAO_GIOP_Message_Connector_12::
       {
         // As this is a union send in the discriminant first
         msg << GIOP::ReferenceAddr;
-        
+
         // Get the IOR
         IOP::IOR *ior;
         CORBA::ULong index = spec.iop_ior (ior);
-        
+
         if (ior)
           {
             // This is a struct IORAddressingInfo. So, marshall each
             // member of the struct one after another in the order
-            // defined. 
+            // defined.
             msg << index;
             msg << *ior;
           }
@@ -566,7 +571,7 @@ TAO_GIOP_Message_Connector_12::
                     ACE_TEXT ("(%N |%l) Unable to handle this request \n")));
       return 0;
     }
-    
+
   return 1;
 }
 
@@ -584,7 +589,7 @@ parse_reply (TAO_Message_State_Factory &mesg_state,
     {
     case TAO_GIOP_REQUEST:
       // We could get this in Bi_Dir GIOP
-      // So, we take some action. 
+      // So, we take some action.
       break;
     case TAO_GIOP_CANCELREQUEST:
     case TAO_GIOP_LOCATEREQUEST:
@@ -619,7 +624,7 @@ parse_reply (TAO_Message_State_Factory &mesg_state,
       // Never happens: why??
       break;
     }
-  
+
   // Align the read pointer on an 8-byte boundary
   state->cdr.align_read_ptr (TAO_GIOP_MESSAGE_ALIGN_PTR);
   return 0;
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index 72707fbd01b..03da51d2b28 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -30,10 +30,10 @@
 
 #include "ace/SString.h"
 #include "tao/ORB.h"
-#include "tao/Principal.h"
+//#include "tao/Principal.h"
 #include "tao/GIOP_Message_Base.h"
 #include "tao/Tagged_Profile.h"
-
+#include "tao/OctetSeqC.h"
 
 class TAO_Export TAO_ServerRequest
 {
@@ -117,7 +117,7 @@ public:
   void send_no_exception_reply (void);
   // Used with reliable oneway requests.
 
-  CORBA::Principal_ptr principal (void) const;
+  // CORBA::Principal_ptr principal (void) const;
 
   TAO_ObjectKey &object_key (void);
 
@@ -138,9 +138,13 @@ public:
   void exception_type (CORBA::ULong except_type);
   // Set the exception type.
 
-  void requesting_principal (CORBA_Principal_ptr principal);
+  /**** Deprecated in CORBA 2.4 *****/
+  // void requesting_principal (CORBA_Principal_ptr principal);
   // Set the requesting principal.
 
+  void requesting_principal (const CORBA_OctetSeq & principal);
+  // Set the requesting principal
+
   TAO_Tagged_Profile &profile (void);
   // Return the reference to the tagged profile
 
@@ -202,7 +206,7 @@ private:
   TAO_Tagged_Profile profile_;
   // The tagged profile that has the addressing information.
 
-  CORBA::Principal_var requesting_principal_;
+  CORBA_OctetSeq_var requesting_principal_;
   // Identifies the requester.
 
   CORBA::Boolean is_dsi_;
diff --git a/TAO/tao/TAO_Server_Request.i b/TAO/tao/TAO_Server_Request.i
index 7480deb572a..8a3945ff85a 100644
--- a/TAO/tao/TAO_Server_Request.i
+++ b/TAO/tao/TAO_Server_Request.i
@@ -67,11 +67,12 @@ TAO_ServerRequest::sync_with_server (CORBA::Boolean sync_flag)
   this->sync_with_server_ = sync_flag;
 }
 
-ACE_INLINE CORBA::Principal_ptr
+/*ACE_INLINE CORBA::Principal_ptr
 TAO_ServerRequest::principal (void) const
 {
   return this->requesting_principal_.ptr ();
 }
+*/
 
 ACE_INLINE TAO_ObjectKey &
 TAO_ServerRequest::object_key (void)
@@ -104,7 +105,7 @@ TAO_ServerRequest::request_id (CORBA::ULong req)
 }
 
 ACE_INLINE void
-TAO_ServerRequest::requesting_principal (CORBA_Principal_ptr principal)
+TAO_ServerRequest::requesting_principal (const CORBA_OctetSeq &principal)
 {
   this->requesting_principal_ = principal;
 }
@@ -133,15 +134,14 @@ TAO_ServerRequest::exception_type (CORBA::ULong except_type)
   this->exception_type_ = except_type;
 }
 
-ACE_INLINE void 
+ACE_INLINE void
 TAO_ServerRequest::is_dsi (void)
 {
   this->is_dsi_ = 1;
 }
 
-ACE_INLINE void 
+ACE_INLINE void
 TAO_ServerRequest::dsi_nvlist_align (ptr_arith_t alignment)
 {
   this->dsi_nvlist_align_ = alignment;
 }
-