archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 03:54:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8236405: Formatting issues in Kerberos debug output

Browse source 
Reviewed-by: mullan
This commit is contained in:
Weijun Wang 2019-12-21 15:27:37 +08:00
parent c33466012e
commit f4af0eadb6
13 changed files with 22 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.security.jgss/share/classes/sun/security/krb5/Checksum.java
View file

@ -102,7 +102,7 @@ public class Checksum {
} catch (Exception exc) {
if (DEBUG) {
System.out.println("Exception in getting default checksum "+
"value from the configuration " +
"value from the configuration. " +
"Setting default checksum to be RSA-MD5");
exc.printStackTrace();
}
@ -122,7 +122,7 @@ public class Checksum {
if (DEBUG) {
System.out.println("Exception in getting safe default " +
"checksum value " +
"from the configuration Setting " +
"from the configuration. Setting " +
"safe default checksum to be RSA-MD5");
exc.printStackTrace();
}

2
src/java.security.jgss/share/classes/sun/security/krb5/Config.java
View file

@ -443,7 +443,7 @@ public class Config {
} catch (NumberFormatException e) {
if (DEBUG) {
System.out.println("Exception in getting value of " +
Arrays.toString(keys) + " " +
Arrays.toString(keys) + ": " +
e.getMessage());
System.out.println("Setting " + Arrays.toString(keys) +
" to minimum value");

20
src/java.security.jgss/share/classes/sun/security/krb5/Credentials.java
View file

@ -236,11 +236,13 @@ public class Credentials {
try {
retVal = ticket.asn1Encode();
} catch (Asn1Exception e) {
if (DEBUG)
System.out.println(e);
if (DEBUG) {
System.out.println(e);
}
} catch (IOException ioe) {
if (DEBUG)
System.out.println(ioe);
if (DEBUG) {
System.out.println(ioe);
}
}
return retVal;
}
@ -330,20 +332,20 @@ public class Credentials {
Credentials creds = acquireDefaultCreds();
if (creds == null) {
if (DEBUG) {
System.out.println(">>> Found no TGT's in LSA");
System.out.println(">>> Found no TGT's in native ccache");
}
return null;
}
if (princ != null) {
if (creds.getClient().equals(princ)) {
if (DEBUG) {
System.out.println(">>> Obtained TGT from LSA: "
System.out.println(">>> Obtained TGT from native ccache: "
+ creds);
}
return creds;
} else {
if (DEBUG) {
System.out.println(">>> LSA contains TGT for "
System.out.println(">>> native ccache contains TGT for "
+ creds.getClient()
+ " not "
+ princ);
@ -352,7 +354,7 @@ public class Credentials {
}
} else {
if (DEBUG) {
System.out.println(">>> Obtained TGT from LSA: "
System.out.println(">>> Obtained TGT from native ccache: "
+ creds);
}
return creds;
@ -445,7 +447,7 @@ public class Credentials {
ensureLoaded();
} catch (Exception e) {
if (DEBUG) {
System.out.println("Can not load credentials cache");
System.out.println("Can not load native ccache library");
e.printStackTrace();
}
alreadyTried = true;

2
src/java.security.jgss/share/classes/sun/security/krb5/KrbServiceLocator.java
View file

@ -57,8 +57,6 @@ class KrbServiceLocator {
private static final Random random = new Random();
private static final boolean DEBUG = Krb5.DEBUG;
private KrbServiceLocator() {
}

1
src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsRep.java
View file

@ -44,7 +44,6 @@ public class KrbTgsRep extends KrbKdcRep {
private TGSRep rep;
private Credentials creds;
private Ticket secondTicket;
private static final boolean DEBUG = Krb5.DEBUG;
KrbTgsRep(byte[] ibuf, KrbTgsReq tgsReq)
throws KrbException, IOException {

2
src/java.security.jgss/share/classes/sun/security/krb5/KrbTgsReq.java
View file

@ -54,8 +54,6 @@ public class KrbTgsReq {
private boolean useSubkey = false;
EncryptionKey tgsReqKey;
private static final boolean DEBUG = Krb5.DEBUG;
private byte[] obuf;
private byte[] ibuf;

2
src/java.security.jgss/share/classes/sun/security/krb5/internal/HostAddress.java
View file

@ -211,7 +211,7 @@ public class HostAddress implements Cloneable {
}
if (DEBUG) {
if (addrType == Krb5.ADDRTYPE_INET ||
addrType == Krb5.ADDRTYPE_INET6) {
addrType == Krb5.ADDRTYPE_INET6) {
System.out.println("Host address is " +
InetAddress.getByAddress(address));
}

2
src/java.security.jgss/share/classes/sun/security/krb5/internal/KerberosTime.java
View file

@ -300,7 +300,7 @@ public class KerberosTime {
if (DEBUG) {
System.out.println("Exception in getting clockskew from " +
"Configuration " +
"using default value " +
"using default value: " +
e.getMessage());
}
}

1
src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/Credentials.java
View file

@ -48,7 +48,6 @@ public class Credentials {
TicketFlags flags;
Ticket ticket;
Ticket secondTicket; //optional
private boolean DEBUG = Krb5.DEBUG;
public Credentials(
PrincipalName new_cname,

1
src/java.security.jgss/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java
View file

@ -45,7 +45,6 @@ import java.io.IOException;
public abstract class CredentialsCache {
static CredentialsCache singleton = null;
static String cacheName;
private static boolean DEBUG = Krb5.DEBUG;
public static CredentialsCache getInstance(PrincipalName principal) {
return FileCredentialsCache.acquireInstance(principal, null);

4
src/java.security.jgss/share/classes/sun/security/krb5/internal/crypto/EType.java
View file

@ -63,7 +63,7 @@ public abstract class EType {
} catch (Exception exc) {
if (DEBUG) {
System.out.println ("Exception in getting allow_weak_crypto, " +
"using default value " +
"using default value: " +
exc.getMessage());
}
}
@ -256,7 +256,7 @@ public abstract class EType {
} catch (KrbException exc) {
if (DEBUG) {
System.out.println("Exception while getting " +
configName + exc.getMessage());
configName + ": " + exc.getMessage());
System.out.println("Using default builtin etypes");
}
return getBuiltInDefaults();

2
src/java.security.jgss/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
View file

@ -300,7 +300,7 @@ public class KeyTab implements KeyTabConstants {
keys.add(key);
if (DEBUG) {
System.out.println("Added key: " + entry.keyType +
"version: " + entry.keyVersion);
", version: " + entry.keyVersion);
}
} else if (DEBUG) {
System.out.println("Found unsupported keytype (" +

6
src/java.security.jgss/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java
View file

@ -193,8 +193,8 @@ class KinitOptions {
PrincipalName p = cis.readPrincipal(version);
cis.close();
if (DEBUG) {
System.out.println(">>>KinitOptions principal name from "+
"the cache is :" + p);
System.out.println(">>>KinitOptions principal name from " +
"the cache is: " + p);
}
return p;
} catch (IOException e) {
@ -211,7 +211,7 @@ class KinitOptions {
String username = System.getProperty("user.name");
if (DEBUG) {
System.out.println(">>>KinitOptions default username is :"
System.out.println(">>>KinitOptions default username is: "
+ username);
}
try {