src/share/classes/com/sun/security/auth/module/JndiLoginModule.java

rev 1387 : 7064075: Security libraries don't build with javac -Xlint:all,-deprecation -Werror
Reviewed-by: xuelei, mullan
Contributed-by: alexandre.boulgakov@oracle.com

*** 30,49 ****
  import javax.security.auth.login.*;
  import javax.security.auth.spi.*;
  import javax.naming.*;
  import javax.naming.directory.*;
  
- import java.io.IOException;
  import java.util.Map;
  import java.util.LinkedList;
- import java.util.ResourceBundle;
  
  import com.sun.security.auth.UnixPrincipal;
  import com.sun.security.auth.UnixNumericUserPrincipal;
  import com.sun.security.auth.UnixNumericGroupPrincipal;
  
- import sun.security.util.AuthResources;
  
  /**
   * <p> The module prompts for a username and password
   * and then verifies the password against the password stored in
   * a directory service configured under JNDI.
--- 30,46 ----
*** 187,197 ****
                                  new LinkedList<UnixNumericGroupPrincipal>();
  
      // initial state
      private Subject subject;
      private CallbackHandler callbackHandler;
!     private Map sharedState;
      private Map<String, ?> options;
  
      private static final String CRYPT = "{crypt}";
      private static final String USER_PWD = "userPassword";
      private static final String USER_UID = "uidNumber";
--- 184,194 ----
                                  new LinkedList<UnixNumericGroupPrincipal>();
  
      // initial state
      private Subject subject;
      private CallbackHandler callbackHandler;
!     private Map<String, Object> sharedState;
      private Map<String, ?> options;
  
      private static final String CRYPT = "{crypt}";
      private static final String USER_PWD = "userPassword";
      private static final String USER_UID = "uidNumber";
*** 215,231 ****
       *
       * @param options options specified in the login
       *                  <code>Configuration</code> for this particular
       *                  <code>LoginModule</code>.
       */
      public void initialize(Subject subject, CallbackHandler callbackHandler,
                             Map<String,?> sharedState,
                             Map<String,?> options) {
  
          this.subject = subject;
          this.callbackHandler = callbackHandler;
!         this.sharedState = sharedState;
          this.options = options;
  
          // initialize any configured options
          debug = "true".equalsIgnoreCase((String)options.get("debug"));
          strongDebug =
--- 212,233 ----
       *
       * @param options options specified in the login
       *                  <code>Configuration</code> for this particular
       *                  <code>LoginModule</code>.
       */
+     // Unchecked warning from (Map<String, Object>)sharedState is safe
+     // since javax.security.auth.login.LoginContext passes a raw HashMap.
+     // Unchecked warnings from options.get(String) are safe since we are
+     // passing known keys.
+     @SuppressWarnings("unchecked")
      public void initialize(Subject subject, CallbackHandler callbackHandler,
                             Map<String,?> sharedState,
                             Map<String,?> options) {
  
          this.subject = subject;
          this.callbackHandler = callbackHandler;
!         this.sharedState = (Map<String, Object>)sharedState;
          this.options = options;
  
          // initialize any configured options
          debug = "true".equalsIgnoreCase((String)options.get("debug"));
          strongDebug =