# HG changeset patch
# User weijun
# Date 1376647047 -28800
# Node ID d669110735f44542cd2abc64e9f111b92da6e662
# Parent  8287d2ea9523ee5950f0e495ec46bbf37a581f88
8022945: Enhance JNDI implementation classes
Reviewed-by: xuelei, ahgross, skoivu

diff -r 8287d2ea9523 -r d669110735f4 jdk/src/share/lib/security/java.security-linux
--- a/jdk/src/share/lib/security/java.security-linux	Mon Aug 19 14:48:08 2013 +0200
+++ b/jdk/src/share/lib/security/java.security-linux	Fri Aug 16 17:57:27 2013 +0800
@@ -181,6 +181,7 @@
                com.sun.imageio.,\
                com.sun.istack.internal.,\
                com.sun.jmx.,\
+               com.sun.naming.internal.,\
                com.sun.proxy.,\
                com.sun.org.apache.bcel.internal.,\
                com.sun.org.apache.regexp.internal.,\
@@ -225,6 +226,7 @@
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.,\
+                   com.sun.naming.internal.,\
                    com.sun.proxy.,\
                    com.sun.org.apache.bcel.internal.,\
                    com.sun.org.apache.regexp.internal.,\
diff -r 8287d2ea9523 -r d669110735f4 jdk/src/share/lib/security/java.security-macosx
--- a/jdk/src/share/lib/security/java.security-macosx	Mon Aug 19 14:48:08 2013 +0200
+++ b/jdk/src/share/lib/security/java.security-macosx	Fri Aug 16 17:57:27 2013 +0800
@@ -182,6 +182,7 @@
                com.sun.imageio.,\
                com.sun.istack.internal.,\
                com.sun.jmx.,\
+               com.sun.naming.internal.,\
                com.sun.proxy.,\
                com.sun.org.apache.bcel.internal.,\
                com.sun.org.apache.regexp.internal.,\
@@ -226,6 +227,7 @@
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.,\
+                   com.sun.naming.internal.,\
                    com.sun.proxy.,\
                    com.sun.org.apache.bcel.internal.,\
                    com.sun.org.apache.regexp.internal.,\
diff -r 8287d2ea9523 -r d669110735f4 jdk/src/share/lib/security/java.security-solaris
--- a/jdk/src/share/lib/security/java.security-solaris	Mon Aug 19 14:48:08 2013 +0200
+++ b/jdk/src/share/lib/security/java.security-solaris	Fri Aug 16 17:57:27 2013 +0800
@@ -183,6 +183,7 @@
                com.sun.imageio.,\
                com.sun.istack.internal.,\
                com.sun.jmx.,\
+               com.sun.naming.internal.,\
                com.sun.proxy.,\
                com.sun.org.apache.bcel.internal.,\
                com.sun.org.apache.regexp.internal.,\
@@ -226,6 +227,7 @@
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.,\
+                   com.sun.naming.internal.,\
                    com.sun.proxy.,\
                    com.sun.org.apache.bcel.internal.,\
                    com.sun.org.apache.regexp.internal.,\
diff -r 8287d2ea9523 -r d669110735f4 jdk/src/share/lib/security/java.security-windows
--- a/jdk/src/share/lib/security/java.security-windows	Mon Aug 19 14:48:08 2013 +0200
+++ b/jdk/src/share/lib/security/java.security-windows	Fri Aug 16 17:57:27 2013 +0800
@@ -182,6 +182,7 @@
                com.sun.imageio.,\
                com.sun.istack.internal.,\
                com.sun.jmx.,\
+               com.sun.naming.internal.,\
                com.sun.proxy.,\
                com.sun.org.apache.bcel.internal.,\
                com.sun.org.apache.regexp.internal.,\
@@ -226,6 +227,7 @@
                    com.sun.imageio.,\
                    com.sun.istack.internal.,\
                    com.sun.jmx.,\
+                   com.sun.naming.internal.,\
                    com.sun.proxy.,\
                    com.sun.org.apache.bcel.internal.,\
                    com.sun.org.apache.regexp.internal.,\
diff -r 8287d2ea9523 -r d669110735f4 jdk/test/java/lang/SecurityManager/CheckPackageAccess.java
--- a/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java	Mon Aug 19 14:48:08 2013 +0200
+++ b/jdk/test/java/lang/SecurityManager/CheckPackageAccess.java	Fri Aug 16 17:57:27 2013 +0800
@@ -23,7 +23,7 @@
 
 /*
  *  @test
- *  @bug 6741606 7146431 8000450
+ *  @bug 6741606 7146431 8000450 8022945
  *  @summary Make sure all restricted packages listed in the package.access
  *           property in the java.security file are blocked
  *  @run main/othervm CheckPackageAccess
@@ -54,6 +54,7 @@
         "com.sun.imageio.",
         "com.sun.istack.internal.",
         "com.sun.jmx.",
+        "com.sun.naming.internal.",
         "com.sun.proxy.",
         "com.sun.org.apache.bcel.internal.",
         "com.sun.org.apache.regexp.internal.",