Navigation Menu

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8257858: [macOS]: Remove JNF dependency from libosxsecurity/KeystoreImpl.m #1845

Closed
wants to merge 18 commits into from

Conversation

wangweij
Copy link
Contributor

@wangweij wangweij commented Dec 18, 2020

This fix covers both


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issues

  • JDK-8257858: [macOS]: Remove JNF dependency from libosxsecurity/KeystoreImpl.m
  • JDK-8257860: [macOS]: Remove JNF dependency from libosxkrb5/SCDynamicStoreConfig.m

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/1845/head:pull/1845
$ git checkout pull/1845

…mpl.m

8257858: [macOS]: Remove JNF dependency from libosxsecurity/KeystoreImpl.m
@bridgekeeper
Copy link

bridgekeeper bot commented Dec 18, 2020

👋 Welcome back weijun! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Dec 18, 2020

@wangweij The following labels will be automatically applied to this pull request:

  • core-libs
  • security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added security security-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Dec 18, 2020
@openjdk openjdk bot added the build build-dev@openjdk.org label Dec 18, 2020
@wangweij
Copy link
Contributor Author

/issue add JDK-8257860

@openjdk
Copy link

openjdk bot commented Dec 18, 2020

@wangweij
Adding additional issue to issue list: 8257860: [macOS]: Remove JNF dependency from libosxkrb5/SCDynamicStoreConfig.m.

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 15, 2021

@wangweij This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@wangweij
Copy link
Contributor Author

New commit pushed. There is completely no dependency on JavaNativeFramework anymore.

Major change this time: Update the format of SCDynamicStoreConfig::getKerberosConfig.

ToDo: clean up JNIUtilities.h, take back JNFPerformEnvBlock.

@erikj79
Copy link
Member

erikj79 commented Jan 29, 2021

/label build

@openjdk
Copy link

openjdk bot commented Jan 29, 2021

@erikj79 The build label was already applied.

@wangweij wangweij marked this pull request as ready for review January 29, 2021 14:30
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 29, 2021
@mlbridge
Copy link

mlbridge bot commented Jan 29, 2021

Copy link
Member

@erikj79 erikj79 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build changes look good.

@openjdk
Copy link

openjdk bot commented Jan 29, 2021

@wangweij This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8257858: [macOS]: Remove JNF dependency from libosxsecurity/KeystoreImpl.m
8257860: [macOS]: Remove JNF dependency from libosxkrb5/SCDynamicStoreConfig.m

Reviewed-by: erikj, prr, ihse, valeriep

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 54 new commits pushed to the master branch:

  • b0ee7a8: 8241995: Clarify InetSocketAddress::toString specification
  • 0ef93fe: 8259265: Refactor UncaughtExceptions shell test as java test.
  • 5324b5c: 8260998: Shenandoah: Restore reference processing statistics reporting
  • c8de943: 8260617: Merge ZipFile encoding check with the initial hash calculation
  • ae2c5f0: 8260581: IGV: enhance node search
  • 9037615: 8222850: jshell tool: Misleading cascade compiler error in switch expression with undefined vars
  • 91e6c75: 8260928: InitArrayShortSize constraint func should print a helpful error message
  • cb127a4: 8198343: Test java/awt/print/PrinterJob/TestPgfmtSetMPA.java may fail w/o printer
  • c008410: 8197825: [Test] Intermittent timeout with javax/swing JColorChooser Test
  • b9d4211: 8260193: Remove JVM_GetInterfaceVersion() and JVM_DTraceXXX
  • ... and 44 more: https://git.openjdk.java.net/jdk/compare/f5ca8385abf22678fdc9c965c60d714d20f54100...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 29, 2021
@wangweij
Copy link
Contributor Author

Added a test. Unfortunately it has to be manual because updating the dynamic store needs sudo privilege.

@AlanBateman
Copy link
Contributor

/label remove core-libs

@openjdk openjdk bot removed the core-libs core-libs-dev@openjdk.org label Jan 31, 2021
@openjdk
Copy link

openjdk bot commented Jan 31, 2021

@AlanBateman
The core-libs label was successfully removed.

Copy link
Member

@magicus magicus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically looks good, but the Obj-C test file needs proper handling.

make/test/JtregNativeJdk.gmk Outdated Show resolved Hide resolved
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 1, 2021
@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 1, 2021
Copy link
Member

@erikj79 erikj79 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build changes look good. Thanks for fixing the .m support in TestFilesCompilation.gmk!

Copy link
Member

@magicus magicus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good now!

if (!kdcs.isEmpty()) {
ri.put("kdc", kdcs);
}
realms.put(nextRealm, ri);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you need to check if ri is empty?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should make no difference to applications whether there is an empty section or not, but I can remove it.

Copy link

@valeriepeng valeriepeng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rest of the Kerberos config handling changes look fine.
Thanks!

@wangweij
Copy link
Contributor Author

wangweij commented Feb 3, 2021

/integrate

@openjdk openjdk bot closed this Feb 3, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 3, 2021
@openjdk
Copy link

openjdk bot commented Feb 3, 2021

@wangweij Since your change was applied there have been 55 commits pushed to the master branch:

  • 472bf62: 8258799: [Testbug] RandomCommandsTest must check if tested directive is added via jcmd
  • b0ee7a8: 8241995: Clarify InetSocketAddress::toString specification
  • 0ef93fe: 8259265: Refactor UncaughtExceptions shell test as java test.
  • 5324b5c: 8260998: Shenandoah: Restore reference processing statistics reporting
  • c8de943: 8260617: Merge ZipFile encoding check with the initial hash calculation
  • ae2c5f0: 8260581: IGV: enhance node search
  • 9037615: 8222850: jshell tool: Misleading cascade compiler error in switch expression with undefined vars
  • 91e6c75: 8260928: InitArrayShortSize constraint func should print a helpful error message
  • cb127a4: 8198343: Test java/awt/print/PrinterJob/TestPgfmtSetMPA.java may fail w/o printer
  • c008410: 8197825: [Test] Intermittent timeout with javax/swing JColorChooser Test
  • ... and 45 more: https://git.openjdk.java.net/jdk/compare/f5ca8385abf22678fdc9c965c60d714d20f54100...master

Your commit was automatically rebased without conflicts.

Pushed as commit 4a8b5c1.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@wangweij wangweij deleted the 8257858 branch February 3, 2021 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated security security-dev@openjdk.org
6 participants