diff options
author | Phil Mesnier <mesnier_p@ociweb.com> | 2007-06-19 15:45:51 +0000 |
---|---|---|
committer | Phil Mesnier <mesnier_p@ociweb.com> | 2007-06-19 15:45:51 +0000 |
commit | 0440a770baceea2dbdb7f4f423bf03db9270a220 (patch) | |
tree | e027c02cd6f2b6555547c233866218df74600d05 /TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp | |
parent | 6c127addcbbbd916af24f2c1d7f3a3a0807c0ad8 (diff) | |
download | ATCD-0440a770baceea2dbdb7f4f423bf03db9270a220.tar.gz |
* orbsvcs/Naming_Service/NT_Naming_Server.cpp:oci_mixed_security_2
Emacs compatibility fix.
* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp:
Clean up compilation errors from earlier commit.
* orbsvcs/orbsvcs/Security/SL2_SecurityManager.h:
* orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp:
* orbsvcs/orbsvcs/SecurityLevel2.idl:
Extended the add_object and remove_object parameter list to be
consistent with the access_allowed_ex. This avoids having to do
more invasive changes to existing TAO core libraries in order to
map object references in a way that they can be reliably
compared to target references.
* orbsvcs/tests/Security/mixed_security_test/server.cpp:
Modify use of add_object to be consistent with interface changes.
Diffstat (limited to 'TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp')
-rw-r--r-- | TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp index c26bbcff395..b55a5f3a268 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp @@ -73,7 +73,7 @@ init_and_setup (int& argc, orb = CORBA::ORB_init (argc, argv); rootpoa = rir<PortableServer::POA> (orb, "RootPOA"); poamgr = rootpoa->the_POAManager(); - + sl3current = rir<SecurityLevel3::SecurityCurrent>(orb, "SecurityLevel3:SecurityCurrent"); @@ -157,12 +157,16 @@ main (int argc, char *argv[]) // 3. Create servant #2 of Foo_i, and its associated Object ACE_NEW_RETURN (server2, Foo_i (orb.in(), sl3current.in()), 1); - Foo::Bar_var server2_obj = server2->_this (); + + Foo::Bar_var server2_obj = server2->_this(); ACE_DEBUG ((LM_DEBUG, "mixed_security/server: " "created servant/object #2\n")); // 4. add servant #2's Object reference to the "permitted" list. - sl2ad->add_object (server2_obj.in(), true); + PortableServer::ObjectId_var oid = rootpoa->servant_to_id (server2); + CORBA::OctetSeq_var poaid = rootpoa->id(); + CORBA::String_var orbid = orb->id(); + sl2ad->add_object (orbid.in(), poaid.in(), oid.in(), true); ACE_DEBUG ((LM_DEBUG, "mixed_security/server: " "added object #2 as a permitted reference for " "non-secure invocations\n")); @@ -177,7 +181,7 @@ main (int argc, char *argv[]) // 6. activate the POA manager poamgr->activate (); - + // 7. run the orb. ACE_DEBUG ((LM_DEBUG, "mixed_security/server: " "running the orb\n")); |