Skip to content
Merged
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
16 changes: 10 additions & 6 deletions core/src/main/java/org/dcache/nfs/v3/NfsServerV3.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2009 - 2022 Deutsches Elektronen-Synchroton,
* Copyright (c) 2009 - 2026 Deutsches Elektronen-Synchroton,
* Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
*
* This library is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -305,15 +305,17 @@ public CREATE3res NFSPROC3_CREATE_3(RpcCall call$, CREATE3args arg1) {

parentStat = fs.getattr(parent);

int fmode = 0644 | Stat.S_IFREG;
int fmode = 0644;
Subject actualSubject = null;
if (newAttr != null) {
fmode = newAttr.mode.mode.value.value | Stat.S_IFREG;
if (newAttr.mode.set_it) {
fmode = newAttr.mode.mode.value.value;
}
if (newAttr.uid.set_it || newAttr.gid.set_it) {
actualSubject = UnixSubjects.toSubject(newAttr.uid.uid.value, newAttr.gid.gid.value);
}
}
inode = fs.create(parent, Stat.Type.REGULAR, path, actualSubject, fmode);
inode = fs.create(parent, Stat.Type.REGULAR, path, actualSubject, fmode | Stat.S_IFREG);
Stat inodeStat = fs.getattr(inode);

res.status = nfsstat.NFS_OK;
Expand Down Expand Up @@ -607,13 +609,15 @@ public MKDIR3res NFSPROC3_MKDIR_3(RpcCall call$, MKDIR3args arg1) {
int mode = 0777;
Subject actualSubject = null;
if (attr != null) {
mode = attr.mode.mode.value.value | Stat.S_IFDIR;
if (attr.mode.set_it) {
mode = attr.mode.mode.value.value;
}
if (attr.uid.set_it || attr.gid.set_it) {
actualSubject = UnixSubjects.toSubject(attr.uid.uid.value, attr.gid.gid.value);
}
}

Inode inode = fs.mkdir(parent, name, actualSubject, mode);
Inode inode = fs.mkdir(parent, name, actualSubject, mode | Stat.S_IFDIR);

res.resok = new MKDIR3resok();
res.resok.obj = new post_op_fh3();
Expand Down
Loading