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

TLS/SSL, Docker, and code tweaks #194

Merged
merged 3 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:22.04

ARG sssd=false

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,8 @@ public DirectoryStream list(Inode _inode, byte[] _verifier, long _cookie) throws

if (null == inodeNumber)
{
inodeToPathMapper_.map((long) e.getId(), path);
inodeNumber = (long) e.getId();
inodeToPathMapper_.map(inodeNumber, path);
}

Stat stat = statPath(path, inodeNumber, e, groupsContainingUser);
Expand Down
4 changes: 2 additions & 2 deletions start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ if [ "$1" != "sha" ]; then
if [ -f /nfsrods_ssl.crt ]; then
echo "Cert found for NFSRODS"
set +e
keytool -delete -noprompt -alias mycert -keystore /etc/ssl/certs/java/cacerts -storepass changeit
keytool -delete -noprompt -alias nfsrods -cacerts -storepass changeit
set -e
echo "Importing cert to OpenJDK keystore"
keytool -import -trustcacerts -keystore /etc/ssl/certs/java/cacerts -storepass changeit -noprompt -alias mycert -file /nfsrods_ssl.crt
keytool -import -trustcacerts -cacerts -storepass changeit -noprompt -alias nfsrods -file /nfsrods_ssl.crt
echo "Done"
else
echo "Cert not found for NFSRODS - not importing"
Expand Down