User: starksm
Date: 01/04/13 13:04:54
Modified: src/main/org/jboss/security/auth/spi
IdentityLoginModule.java
UsernamePasswordLoginModule.java
UsersRolesLoginModule.java
Log:
Integrate the 415818 bug fixes into the main branch.
Revision Changes Path
1.2 +3 -3
jbosssx/src/main/org/jboss/security/auth/spi/IdentityLoginModule.java
Index: IdentityLoginModule.java
===================================================================
RCS file:
/cvsroot/jboss/jbosssx/src/main/org/jboss/security/auth/spi/IdentityLoginModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IdentityLoginModule.java 2001/04/11 02:04:21 1.1
+++ IdentityLoginModule.java 2001/04/13 20:04:54 1.2
@@ -30,7 +30,7 @@
@see org.jboss.security.SimplePrincipal
@author [EMAIL PROTECTED]
-@version $Revision: 1.1 $
+@version $Revision: 1.2 $
*/
public class IdentityLoginModule extends AbstractServerLoginModule
{
@@ -58,8 +58,8 @@
Principal principal = new SimplePrincipal(principalName);
subject.getPrincipals().add(principal);
- // Put the principal into the sharedState map
- sharedState.put("javax.security.auth.login.name", principal);
+ // Put the principal name into the sharedState map
+ sharedState.put("javax.security.auth.login.name", principalName);
return true;
}
1.2 +1 -1
jbosssx/src/main/org/jboss/security/auth/spi/UsernamePasswordLoginModule.java
Index: UsernamePasswordLoginModule.java
===================================================================
RCS file:
/cvsroot/jboss/jbosssx/src/main/org/jboss/security/auth/spi/UsernamePasswordLoginModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UsernamePasswordLoginModule.java 2001/04/11 02:04:21 1.1
+++ UsernamePasswordLoginModule.java 2001/04/13 20:04:54 1.2
@@ -37,7 +37,7 @@
@see #getUsersRoles()
@author [EMAIL PROTECTED]
-@version $Revision: 1.1 $
+@version $Revision: 1.2 $
*/
public abstract class UsernamePasswordLoginModule extends AbstractServerLoginModule
{
@@ -89,7 +89,7 @@
if( getUseFirstPass() == true )
{ // Add the username and password to the shared state map
- sharedState.put("javax.security.auth.login.name", identity);
+ sharedState.put("javax.security.auth.login.name", username);
sharedState.put("javax.security.auth.login.password", credential);
}
return true;
1.3 +4 -4
jbosssx/src/main/org/jboss/security/auth/spi/UsersRolesLoginModule.java
Index: UsersRolesLoginModule.java
===================================================================
RCS file:
/cvsroot/jboss/jbosssx/src/main/org/jboss/security/auth/spi/UsersRolesLoginModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UsersRolesLoginModule.java 2001/04/12 02:53:56 1.2
+++ UsersRolesLoginModule.java 2001/04/13 20:04:54 1.3
@@ -96,10 +96,10 @@
*/
public boolean login() throws LoginException
{
- if (_users == null || _roles == null)
- {
- throw new LoginException("Missing _users or _roles properties file.");
- }
+ if(_users == null )
+ throw new LoginException("Missing users.properties file.");
+ if(_roles == null )
+ throw new LoginException("Missing roles.properties file.");
return super.login();
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
