# HG changeset patch # User weijun # Date 1520566572 -28800 # Node ID 82a3005cb038d2a096e1a9b9cdd241550a392d54 # Parent 1d2cb50c14922e47ba6c197775457a6b74142428 8199154: Accessibility issues in jdk.security.auth Reviewed-by: valeriep diff -r 1d2cb50c1492 -r 82a3005cb038 src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java Fri Mar 02 11:43:19 2018 +0100 +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java Fri Mar 09 11:36:12 2018 +0800 @@ -237,56 +237,56 @@ * {@code useFirstPass = true}, no user prompt is made. *

Examples of some configuration values for Krb5LoginModule in * JAAS config file and the results are: - *

- *
{@code
+ * 
+ *
{@code
  * doNotPrompt = true}
* This is an illegal combination since none of {@code useTicketCache, * useKeyTab, useFirstPass} and {@code tryFirstPass} - * is set and the user can not be prompted for the password.
+ * is set and the user can not be prompted for the password. * - *
{@code
+ * 
{@code
  * ticketCache = }
* This is an illegal combination since {@code useTicketCache} * is not set to true and the ticketCache is set. A configuration error - * will occur.
+ * will occur. * - *
{@code
+ * 
{@code
  * renewTGT = true}
* This is an illegal combination since {@code useTicketCache} is - * not set to true and renewTGT is set. A configuration error will occur.
+ * not set to true and renewTGT is set. A configuration error will occur. * - *
{@code
+ * 
{@code
  * storeKey = true  useTicketCache = true  doNotPrompt = true}
* This is an illegal combination since {@code storeKey} is set to * true but the key can not be obtained either by prompting the user or from - * the keytab, or from the shared state. A configuration error will occur.
+ * the keytab, or from the shared state. A configuration error will occur. * - *
{@code
+ * 
{@code
  * keyTab =   doNotPrompt = true}
* This is an illegal combination since useKeyTab is not set to true and - * the keyTab is set. A configuration error will occur.
+ * the keyTab is set. A configuration error will occur. * - *
{@code
+ * 
{@code
  * debug = true}
* Prompt the user for the principal name and the password. * Use the authentication exchange to get TGT from the KDC and * populate the {@code Subject} with the principal and TGT. - * Output debug messages.
+ * Output debug messages. * - *
{@code
+ * 
{@code
  * useTicketCache = true  doNotPrompt = true}
* Check the default cache for TGT and populate the {@code Subject} * with the principal and TGT. If the TGT is not available, - * do not prompt the user, instead fail the authentication.
+ * do not prompt the user, instead fail the authentication. * - *
{@code
+ * 
{@code
  * principal =   useTicketCache = true  doNotPrompt = true}
* Get the TGT from the default cache for the principal and populate the * Subject's principal and private creds set. If ticket cache is * not available or does not contain the principal's TGT - * authentication will fail.
+ * authentication will fail. * - *
{@code
+ * 
{@code
  * useTicketCache = true
  * ticketCache = 
  * useKeyTab = true
@@ -297,9 +297,9 @@
  * use the key in the keytab to perform authentication exchange with the
  * KDC and acquire the TGT.
  * The Subject will be populated with the principal and the TGT.
- * If the key is not available or valid then authentication will fail.
+ * If the key is not available or valid then authentication will fail. * - *
{@code
+ * 
{@code
  * useTicketCache = true  ticketCache = }
* The TGT will be obtained from the cache specified. * The Kerberos principal name used will be the principal name in @@ -307,17 +307,17 @@ * ticket cache the user will be prompted for the principal name * and the password. The TGT will be obtained using the authentication * exchange with the KDC. - * The Subject will be populated with the TGT.
+ * The Subject will be populated with the TGT. * - *
{@code
+ * 
{@code
  * useKeyTab = true  keyTab=  principal =   storeKey = true}
* The key for the principal will be retrieved from the keytab. * If the key is not available in the keytab the user will be prompted * for the principal's password. The Subject will be populated * with the principal's key either from the keytab or derived from the - * password entered.
+ * password entered. * - *
{@code
+ * 
{@code
  * useKeyTab = true  keyTab =   storeKey = true  doNotPrompt = false}
* The user will be prompted for the service principal name. * If the principal's @@ -325,14 +325,14 @@ * Subject's private credentials. An authentication exchange will be * attempted with the principal name and the key from the Keytab. * If successful the TGT will be added to the - * Subject's private credentials set. Otherwise the authentication will fail.
+ * Subject's private credentials set. Otherwise the authentication will fail. * - *
{@code
+ * 
{@code
  * isInitiator = false  useKeyTab = true  keyTab =   storeKey = true  principal = *}
* The acceptor will be an unbound acceptor and it can act as any principal - * as long that principal has keys in the keytab.
+ * as long that principal has keys in the keytab. * - *
{@code
+ * 
{@code
  * useTicketCache = true
  * ticketCache = 
  * useKeyTab = true
@@ -347,21 +347,21 @@
  * This secret key will be first retrieved from the keytab. If the key
  * is not available, the user will be prompted for the password. In either
  * case, the key derived from the password will be added to the
- * Subject's private credentials set.
+ * Subject's private credentials set. * - *
{@code
+ * 
{@code
  * isInitiator = false}
* Configured to act as acceptor only, credentials are not acquired * via AS exchange. For acceptors only, set this value to false. - * For initiators, do not set this value to false.
+ * For initiators, do not set this value to false. * - *
{@code
+ * 
{@code
  * isInitiator = true}
* Configured to act as initiator, credentials are acquired * via AS exchange. For initiators, set this value to true, or leave this - * option unset, in which case default value (true) will be used.
+ * option unset, in which case default value (true) will be used. * - *
+ * * * @author Ram Marti */ diff -r 1d2cb50c1492 -r 82a3005cb038 src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java --- a/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java Fri Mar 02 11:43:19 2018 +0100 +++ b/src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java Fri Mar 09 11:36:12 2018 +0800 @@ -92,7 +92,6 @@ * *

The following option is mandatory and must be specified in this * module's login {@link Configuration}: - *

*
*
userProvider=ldap_urls *
@@ -114,11 +113,10 @@ * is supported (once DNS has been configured to support such a service). * It is enabled by omitting the hostname and port number components from * the LDAP URL.
- *
+ * * *

This module also recognizes the following optional {@link Configuration} * options: - *

*
*
userFilter=ldap_filter
*
This option specifies the search filter to use to locate a user's @@ -195,8 +193,7 @@ * *
{@code debug}
*
if {@code true}, debug messages are displayed on the standard - * output stream. - *
+ * output stream.
*
* *