diff options
Diffstat (limited to 'javax/security/auth/login')
| -rw-r--r-- | javax/security/auth/login/AppConfigurationEntry.java | 4 | ||||
| -rw-r--r-- | javax/security/auth/login/Configuration.java | 14 | ||||
| -rw-r--r-- | javax/security/auth/login/LoginContext.java | 16 | ||||
| -rw-r--r-- | javax/security/auth/login/NullConfiguration.java | 4 |
4 files changed, 18 insertions, 20 deletions
diff --git a/javax/security/auth/login/AppConfigurationEntry.java b/javax/security/auth/login/AppConfigurationEntry.java index fd4d09210..ecb7afa3a 100644 --- a/javax/security/auth/login/AppConfigurationEntry.java +++ b/javax/security/auth/login/AppConfigurationEntry.java @@ -1,5 +1,5 @@ /* AppConfigurationEntry.java - Copyright (C) 2004, 2006, 2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2006, 2014, 2015 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -95,6 +95,7 @@ public class AppConfigurationEntry // Object methods ---------------------------------------------------------- + @Override public String toString() { @@ -127,6 +128,7 @@ public class AppConfigurationEntry // Instance methods. // ----------------------------------------------------------------------- + @Override public String toString() { if (this == LoginModuleControlFlag.REQUIRED) diff --git a/javax/security/auth/login/Configuration.java b/javax/security/auth/login/Configuration.java index bbaef065d..93782950f 100644 --- a/javax/security/auth/login/Configuration.java +++ b/javax/security/auth/login/Configuration.java @@ -1,5 +1,5 @@ /* Configuration.java - Copyright (C) 2004, 2006, 2014 Free Software Foundation, Inc. + Copyright (C) 2004, 2006, 2014, 2015 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,11 +38,11 @@ exception statement from your version. */ package javax.security.auth.login; +import gnu.java.security.action.GetSecurityPropertyAction; + import gnu.javax.security.auth.login.GnuConfiguration; import java.security.AccessController; -import java.security.PrivilegedAction; -import java.security.Security; import javax.security.auth.AuthPermission; @@ -97,13 +97,7 @@ public abstract class Configuration if (config == null) { String conf = AccessController.doPrivileged - (new PrivilegedAction<String>() - { - public String run() - { - return Security.getProperty ("login.configuration.provider"); - } - }); + (new GetSecurityPropertyAction ("login.configuration.provider")); try { if (conf != null) diff --git a/javax/security/auth/login/LoginContext.java b/javax/security/auth/login/LoginContext.java index 39d8702c9..f05c660b5 100644 --- a/javax/security/auth/login/LoginContext.java +++ b/javax/security/auth/login/LoginContext.java @@ -96,13 +96,13 @@ public class LoginContext this.cbHandler = cbHandler; if (config == null) config = Configuration.getConfig(); - AppConfigurationEntry[] entries = config.getAppConfigurationEntry (name); - if (entries == null) - entries = config.getAppConfigurationEntry (OTHER); - if (entries == null) + AppConfigurationEntry[] appEntries = config.getAppConfigurationEntry (name); + if (appEntries == null) + appEntries = config.getAppConfigurationEntry (OTHER); + if (appEntries == null) throw new LoginException ("no configured modules for application " + name); - this.entries = entries; + this.entries = appEntries; modules = new LoginModule[entries.length]; sharedState = new HashMap<String,Object>(); for (int i = 0; i < entries.length; i++) @@ -223,7 +223,7 @@ public class LoginContext } private LoginModule lookupModule (AppConfigurationEntry entry, - Subject subject, Map<String,?> sharedState) + Subject subj, Map<String,?> state) throws LoginException { LoginModule module = null; @@ -251,7 +251,7 @@ public class LoginContext cause = ie; } - if (cause != null) + if (module == null) { LoginException le = new LoginException ("could not load module " + entry.getLoginModuleName()); @@ -259,7 +259,7 @@ public class LoginContext throw le; } - module.initialize (subject, cbHandler, sharedState, entry.getOptions()); + module.initialize (subj, cbHandler, state, entry.getOptions()); return module; } } diff --git a/javax/security/auth/login/NullConfiguration.java b/javax/security/auth/login/NullConfiguration.java index a3f0c9943..579c1386b 100644 --- a/javax/security/auth/login/NullConfiguration.java +++ b/javax/security/auth/login/NullConfiguration.java @@ -1,5 +1,5 @@ /* NullConfiguration.java -- no-op default login configuration. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2014 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -51,11 +51,13 @@ final class NullConfiguration extends Configuration // Instance methods. // ------------------------------------------------------------------------- + @Override public AppConfigurationEntry[] getAppConfigurationEntry (String applicationName) { return null; } + @Override public void refresh() { } |