[jdk11u-dev] RFR: 8290368: Introduce LDAP and RMI protocol-specific object factory filters to JNDI implementation

[Andrew John Hughes]

On Mon, 3 Nov 2025 12:33:40 GMT, Pooja-DP <duke at openjdk.org> wrote:

> This pull request contains a backport of commit https://github.com/openjdk/jdk17u/commit/39a6bf2158c2f35399c6739e4b9578f13ea6b7e4 from the https://github.com/openjdk/jdk17u
> 
> Bug Ref: https://bugs.openjdk.org/browse/JDK-8290368
> 
> Signed-off-by: Pooja.D.P1 <Pooja.D.P1 at ibm.com>

It seems that when 8244473 was backported to 11u, documentation changes were not included so I think it is correct to include them here, along with fixing the ordering in `java.security` caused by patches being applied in a different order as far as I can see.

There are still some conflict hunks present in `src/java.naming/share/classes/module-info.java` and a couple of bits from 8244473 still missing:

~~~
--- src/java.naming/share/classes/module-info.java      2025-12-03 09:33:23.798486609 +0000
+++ ../jdk/src/java.naming/share/classes/module-info.java       2025-12-03 01:34:51.274570322 +0000
@@ -29,11 +29,11 @@
  * Common standard JNDI environment properties that may be supported
  * by JNDI providers are defined and documented in
  * {@link javax.naming.Context}. Specific JNDI provider implementations
- * may also support other environment properties, which are specific
+ * may also support other environment or system properties, which are specific
  * to their implementation.
  *
  * @implNote
- * The following implementation specific properties are supported by the
+ * The following implementation specific environment properties are supported by the
  * default LDAP Naming Service Provider implementation in the JDK:
  * <ul>
  *     <li>{@code java.naming.ldap.factory.socket}:
@@ -86,8 +86,6 @@
  *         channel binding information to the server.
  *     </li>
  * </ul>
-<<<<<<< HEAD
-=======
  * <p>The following implementation specific system properties are supported by the
  * default LDAP Naming Service Provider implementation in the JDK:
  * <ul>
~~~

If you can fix this up, this should be ready to go.

What testing has been done with this change?

Also please go to https://github.com/Pooja-DP/jdk11u-dev/actions and enable GitHub Actions as you are not running the testing on this pull request.

-------------

Changes requested by andrew (Reviewer).

PR Review: https://git.openjdk.org/jdk11u-dev/pull/3111#pullrequestreview-3534105964
PR Comment: https://git.openjdk.org/jdk11u-dev/pull/3111#issuecomment-3605952705