changeset 12649:ee8b1bc2f534

8077670: sun/security/krb5/auto/MaxRetries.java may fail with BindException Reviewed-by: chegar
author weijun
date Thu, 27 Aug 2015 07:52:12 +0800
parents f0435c3215ab
children facea01d6b68
files test/com/sun/security/jgss/InquireSecContextPermissionCheck.java test/sun/security/krb5/auto/MaxRetries.java
diffstat 2 files changed, 7 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/test/com/sun/security/jgss/InquireSecContextPermissionCheck.java	Wed Aug 26 11:18:38 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 6710360
- * @summary export Kerberos session key to applications
- */
-
-import com.sun.security.jgss.InquireSecContextPermission;
-
-public class InquireSecContextPermissionCheck {
-
-    public static void main(String[] args) throws Exception {
-
-        InquireSecContextPermission p0, p1;
-        p0 = new InquireSecContextPermission(
-                "KRB5_GET_SESSION_KEY");
-        p1 = new InquireSecContextPermission("*");
-
-        if (!p1.implies(p0) || !p1.implies(p1) || !p0.implies(p0)) {
-            throw new Exception("Check failed");
-        }
-
-        if (p0.implies(p1)) {
-            throw new Exception("This is bad");
-        }
-    }
-}
-
--- a/test/sun/security/krb5/auto/MaxRetries.java	Wed Aug 26 11:18:38 2015 -0700
+++ b/test/sun/security/krb5/auto/MaxRetries.java	Thu Aug 27 07:52:12 2015 +0800
@@ -34,14 +34,18 @@
 import java.security.Security;
 
 public class MaxRetries {
+
+    static int idlePort = -1;
+
     public static void main(String[] args)
             throws Exception {
 
         System.setProperty("sun.security.krb5.debug", "true");
         new OneKDC(null).writeJAASConf();
 
-        // An idle UDP socket to revent PortUnreachableException
-        DatagramSocket ds = new DatagramSocket(33333);
+        // An idle UDP socket to prevent PortUnreachableException
+        DatagramSocket ds = new DatagramSocket();
+        idlePort = ds.getLocalPort();
 
         System.setProperty("java.security.krb5.conf", "alternative-krb5.conf");
 
@@ -200,7 +204,7 @@
                     fw.write("    kdc_timeout = " + BadKdc.toReal(value*1000) + "\n");
                 }
                 // Add a bad KDC as the first candidate
-                fw.write("    kdc = localhost:33333\n");
+                fw.write("    kdc = localhost:" + idlePort + "\n");
             }
             fw.write(s + "\n");
         }