# HG changeset patch
# Parent 134084b6fb452c0dc6126f2bbbfe2db4eccf7641

diff -r 134084b6fb45 src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java
--- a/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java	Tue Nov 28 11:58:11 2017 +0100
+++ b/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java	Tue Nov 28 11:59:14 2017 +0100
@@ -252,6 +252,7 @@
         System.out.println("\tprincipal   the principal name "+
                 "(i.e., qweadf@ATHENA.MIT.EDU qweadf)");
         System.out.println("\tpassword    the principal's Kerberos password");
+        System.out.println("\t-? -h --help Print this help message and exit");
     }
 
     public boolean getAddressOption() {
diff -r 134084b6fb45 src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java
--- a/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java	Tue Nov 28 11:58:11 2017 +0100
+++ b/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Klist.java	Tue Nov 28 11:59:14 2017 +0100
@@ -356,5 +356,6 @@
         System.out.println("\t-t \t shows keytab entry timestamps");
         System.out.println("\t-K \t shows keytab entry key value");
         System.out.println("\t-e \t shows keytab entry key type");
+        System.out.println("\t-? -h --help print this help message and exit");
     }
 }
diff -r 134084b6fb45 src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Ktab.java
--- a/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Ktab.java	Tue Nov 28 11:58:11 2017 +0100
+++ b/src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/Ktab.java	Tue Nov 28 11:59:14 2017 +0100
@@ -453,6 +453,7 @@
         System.out.println();
         System.out.println("Common option(s):");
         System.out.println();
+        System.out.println("-?, -h, --help print this help message and exit.");
         System.out.println("-k <keytab name>\n"
                 + "    specify keytab name and path with prefix FILE:");
     }
diff -r 134084b6fb45 test/jdk/tools/launcher/HelpFlagsTest.java
--- a/test/jdk/tools/launcher/HelpFlagsTest.java	Tue Nov 28 11:58:11 2017 +0100
+++ b/test/jdk/tools/launcher/HelpFlagsTest.java	Tue Nov 28 11:59:14 2017 +0100
@@ -59,12 +59,6 @@
         "jconsole",         // gui, don't test
         "servertool",       // none. Shell, don't test.
         "javaw",            // don't test, win only
-        // These shall have a help message that resembles that of
-        // MIT's tools. Thus -?, -h and --help are supported, but not
-        // mentioned in the help text.
-        "kinit",
-        "klist",
-        "ktab"
     };
 
     // Lists which tools support which flags.
@@ -155,6 +149,9 @@
         new ToolHelpSpec("jstat",       1,   1,   1,   0,         1,    0,     1,       0),   // -?, -h, --help, -help accepted but not documented.
         new ToolHelpSpec("jstatd",      1,   1,   1,   0,         0,    0,     1,       0),   // -?, -h, --help
         new ToolHelpSpec("keytool",     1,   1,   1,   0,         1,    0,     1,       0),   // none, prints help message anyways.
+        new ToolHelpSpec("kinit",       1,   1,   1,   0,         1,    0,     0,       1),   // -?, -h, --help, -help accepted but not documented.
+        new ToolHelpSpec("klist",       1,   1,   1,   0,         0,    0,    -1,       0),   // -?, -h, --help, win only
+        new ToolHelpSpec("ktab",        1,   1,   1,   0,         1,    0,    -1,       0),   // -?, -h, --help, -help accepted but not documented. win only.
         new ToolHelpSpec("orbd",        1,   1,   1,   0,         0,    0,     0,       1),   // -?, -h, --help
         new ToolHelpSpec("pack200",     1,   1,   1,   0,         1,    0,     2,       0),   // -?, -h, --help, -help accepted but not documented.
         new ToolHelpSpec("rmic",        0,   0,   0,   0,         0,    0,     1,       0),   // none, pirnts help message anyways.