-
Notifications
You must be signed in to change notification settings - Fork 164
8200468: Port the native GSS-API bridge to Windows #335
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
Conversation
👋 Welcome back abakhtin! A progress list of the required criteria for merging this PR into |
This backport pull request has now been updated with issue from the original commit. |
Webrevs
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mostly looks good but there are a couple of issues:
- You mention adjusting the copyright header for
NativeUtil.c
andNativeUtil.h
, but I don't see them in the patch. They should be bumped from 2014 to 2018. The other omissions are correct, as the files already have newer copyright headers. - The change of the
@library
line inBasicProc.java
is unneeded. There is a Platform class injdk.testlibrary
which can be imported asjdk.testlibrary.Platform
. We should aim to resolve this duplication (caused by the JFR import) going forward, but I think for now, the test should stick to one test library. Adding the/lib
reference means it could potentially mix the two test libraries together as they have duplicated classes, so please drop thelib
and usejdk.testlibrary.Platform
for now. - In the 11u patch, the
pc.env
line is outside the!Platform.isWindows
block, but seems to be inside in the 8u version.
11u:
+ if (!Platform.isWindows()) {
+ Files.setPosixFilePermissions(Paths.get(label + ".ccache"),
+ Set.of(PosixFilePermission.OWNER_READ,
+ PosixFilePermission.OWNER_WRITE));
+ }
+ pc.env("KRB5CCNAME", "FILE:" + label + ".ccache");
$ find jdk/test/ -name 'Platform.java'
jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java
jdk/test/lib/jdk/test/lib/Platform.java
Hello Andrew! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. It looks good with the additional changes. If you flag with jdk8u-fix-request
, I'll approve for 8u too.
What's the end goal here? JDK-6722928? I'm just wondering because that one will need a CSR, essentially a clone of what was done for 11u
@alexeybakhtin This change now passes all automated pre-integration checks. After integration, the commit message for the final commit will be:
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 no new commits pushed to the ➡️ To integrate this PR with the above commit message to the |
Thank you for the review. Yes, you are right. The final goal is to backport the native GSS-API library for Windows on the basis of Windows SSPI APIs (JDK-6722928) and corresponding fixes (like JDK-8225687). The CSR for JDK-6722928 is a part of backport activity, so I'm going to submit it also. |
Thanks. I've added It is a little curious that Oracle apparently backported 8225687 to 8u & 11u, but not 6722928, and so there is no CSR in place already. Definitely worth making sure there's plenty of time to allow the CSR to be approved, so thanks for starting on this early in the 8u392 cycle. |
/integrate |
Going to push as commit 0944384. |
@alexeybakhtin Pushed as commit 0944384. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Hello,
I'd like to backport JDK-8200568: port the native GSS-API bridge to Windows to JDK8u
This is a prerequisite of the JDK-6722928 and JDK-8225687
The backport is not clean. I have to to make the following changes:
jdk/make/lib/SecurityLibraries.gmk
jdk/src/share/native/sun/security/jgss/wrapper/NativeUtil.c
jdk/src/share/native/sun/security/jgss/wrapper/NativeUtil.h
jdk/src/share/classes/sun/security/jgss/GSSManagerImpl.java
jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c is moved to jdk/src/share/native/sun/security/jgss/wrapper/NativeFunc.c
jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h is moved to jdk/src/share/native/sun/security/jgss/wrapper/NativeFunc.h
jdk/test/sun/security/krb5/auto/BasicProc.java
jdk/test/java/security/testlibrary/Proc.java
All related jtreg tests passed successfully on Windows
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/335/head:pull/335
$ git checkout pull/335
Update a local copy of the PR:
$ git checkout pull/335
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/335/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 335
View PR using the GUI difftool:
$ git pr show -t 335
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/335.diff
Webrev
Link to Webrev Comment