[jboss-cvs] JBossAS SVN: r57323 - branches/Branch_4_0/iiop/src/main/org/jboss/iiop/csiv2

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2006-10-01 07:13:47 -0400 (Sun, 01 Oct 2006)
New Revision: 57323

Modified:
   branches/Branch_4_0/iiop/src/main/org/jboss/iiop/csiv2/CSIv2Util.java
Log:
Merged revision 55119 from trunk (EJBTHREE-667: iiop)

Modified: branches/Branch_4_0/iiop/src/main/org/jboss/iiop/csiv2/CSIv2Util.java
===================================================================
--- branches/Branch_4_0/iiop/src/main/org/jboss/iiop/csiv2/CSIv2Util.java	2006-10-01 11:07:11 UTC (rev 57322)
+++ branches/Branch_4_0/iiop/src/main/org/jboss/iiop/csiv2/CSIv2Util.java	2006-10-01 11:13:47 UTC (rev 57323)
@@ -325,7 +325,7 @@
       AS_ContextSec context = null;
       
       // the content of the context
-      int support = 0;
+      int support = EstablishTrustInClient.value; // per default support this
       int require = 0;
       byte[] clientAuthMech = {};
       byte[] targetName = {};
@@ -338,6 +338,9 @@
       if( asMeta == null || asMeta.getAuthMethod().equals(AsContext.AUTH_METHOD_NONE)
          || asMeta.isRequired() == false )
       {
+         // TODO: check if an empty AS context may contain a target name.
+         targetName = encodeGssExportedName(targetName);
+         
          context = new AS_ContextSec((short) support,
             (short) require,
             clientAuthMech,
@@ -345,9 +348,6 @@
       }
       else
       {
-         // we do support
-         support = EstablishTrustInClient.value;
-         
          // required depends on the metadata
          if( asMeta.isRequired() )
             require = EstablishTrustInClient.value;