stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8172017: Two tests sun/security/krb5/auto/ReplayCacheTestProc.java and rcache_usemd5.sh fail on Solaris

Browse Source 
Reviewed-by: mullan
This commit is contained in:
Weijun Wang 2017-01-05 22:37:52 +08:00
parent 5ada754c71
commit c104608e37
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java
View File

@ -23,7 +23,7 @@
/* /*
* @test * @test
* @bug 7152176 8168518 * @bug 7152176 8168518 8172017
* @summary More krb5 tests * @summary More krb5 tests
* @library ../../../../java/security/testlibrary/ /test/lib * @library ../../../../java/security/testlibrary/ /test/lib
* @run main/othervm/timeout=300 ReplayCacheTestProc * @run main/othervm/timeout=300 ReplayCacheTestProc
@ -75,19 +75,28 @@ public class ReplayCacheTestProc {
private static String HOST = "localhost"; private static String HOST = "localhost";
private static final String SERVICE; private static final String SERVICE;
private static long uid;
private static String cwd;
static { static {
String tmp = System.getProperty("test.service"); String tmp = System.getProperty("test.service");
SERVICE = (tmp == null) ? "service" : tmp; SERVICE = (tmp == null) ? "service" : tmp;
uid = jdk.internal.misc.VM.geteuid();
// Where should the rcache be saved. KRB5RCACHEDIR is not
// recognized on Solaris (might be supported on Solaris 12),
// and directory name is different when launched by root.
// See manpage krb5envvar(5) on KRB5RCNAME.
if (System.getProperty("os.name").startsWith("SunOS")) {
if (uid == 0) {
cwd = "/var/krb5/rcache/root/";
} else {
cwd = "/var/krb5/rcache/";
}
} else {
cwd = System.getProperty("user.dir");
}
} }
// Where should the rcache be saved. It seems KRB5RCACHEDIR is not
// recognized on Solaris. Maybe version too low? I see 1.6.
private static String cwd =
System.getProperty("os.name").startsWith("SunOS") ?
"/var/krb5/rcache/" :
System.getProperty("user.dir");
private static MessageDigest md5, sha256; private static MessageDigest md5, sha256;
static { static {
@ -99,7 +108,6 @@ public class ReplayCacheTestProc {
} }
} }
private static long uid;
public static void main0(String[] args) throws Exception { public static void main0(String[] args) throws Exception {
System.setProperty("java.security.krb5.conf", OneKDC.KRB5_CONF); System.setProperty("java.security.krb5.conf", OneKDC.KRB5_CONF);
@ -114,8 +122,6 @@ public class ReplayCacheTestProc {
Ex[] result; Ex[] result;
int numPerType = 2; // number of acceptors per type int numPerType = 2; // number of acceptors per type
uid = jdk.internal.misc.VM.geteuid();
KDC kdc = KDC.create(OneKDC.REALM, HOST, 0, true); KDC kdc = KDC.create(OneKDC.REALM, HOST, 0, true);
for (int i=0; i<nc; i++) { for (int i=0; i<nc; i++) {
kdc.addPrincipal(client(i), OneKDC.PASS); kdc.addPrincipal(client(i), OneKDC.PASS);