Title: [2435] trunk/openejb2/modules/core/src/java/org/openejb/corba/util: Merge fix for GERONIMO-1615 and GERONIMO-1616 to head
- Revision
- 2435
- Author
- ammulder
- Date
- 2006-02-09 23:23:36 -0500 (Thu, 09 Feb 2006)
Log Message
Merge fix for GERONIMO-1615 and GERONIMO-1616 to head
Modified Paths
Diff
Modified: trunk/openejb2/modules/core/src/java/org/openejb/corba/security/config/css/CSSGSSUPMechConfigDynamic.java (2434 => 2435)
--- trunk/openejb2/modules/core/src/java/org/openejb/corba/security/config/css/CSSGSSUPMechConfigDynamic.java 2006-02-10 04:17:01 UTC (rev 2434)
+++ trunk/openejb2/modules/core/src/java/org/openejb/corba/security/config/css/CSSGSSUPMechConfigDynamic.java 2006-02-10 04:23:36 UTC (rev 2435)
@@ -98,10 +98,15 @@
if (creds.size() != 0) {
for (Iterator iter = creds.iterator(); iter.hasNext();) {
- credential = (NamedUsernamePasswordCredential) iter.next();
- if (credential.getName().equals(domain)) break;
+ NamedUsernamePasswordCredential temp = (NamedUsernamePasswordCredential) iter.next();
+ if (temp.getName().equals(domain)) {
+ credential = temp;
+ break;
+ }
}
- encoding = Util.encodeGSSUPToken(Util.getORB(), Util.getCodec(), credential.getName(), new String(credential.getPassword()), domain);
+ if(credential != null) {
+ encoding = Util.encodeGSSUPToken(Util.getORB(), Util.getCodec(), credential.getUsername(), new String(credential.getPassword()), domain);
+ }
}
if (encoding == null) encoding = new byte[0];
Modified: trunk/openejb2/modules/core/src/java/org/openejb/corba/util/Util.java (2434 => 2435)
--- trunk/openejb2/modules/core/src/java/org/openejb/corba/util/Util.java 2006-02-10 04:17:01 UTC (rev 2434)
+++ trunk/openejb2/modules/core/src/java/org/openejb/corba/util/Util.java 2006-02-10 04:23:36 UTC (rev 2435)
@@ -102,7 +102,7 @@
* <p/>
* Note: #getORB() and #getCodec() rely on UtilInitializer to initialze the ORB and codec.
*
- * @version $Rev: $ $Date$
+ * @version $Rev$ $Date$
* @see UtilInitializer
*/
public final class Util {
@@ -330,7 +330,7 @@
// create and encode a GSSUP initial context token
InitialContextToken init_token = new InitialContextToken();
- init_token.username = (user + "@" + target).getBytes("UTF-8");
+ init_token.username = user.getBytes("UTF-8");
init_token.password = pwd.getBytes("UTF-8");
