RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

nfsclient: Use UID and GID of NFS handle

Browse Source 
Use UID and GID of the NFS handle for node and symbolic link creation.
This commit is contained in:
Sebastian Huber
2012-04-23 16:21:42 +02:00
parent e384438b9c
commit bc04436cce
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cpukit/libfs/src/nfsclient/src/nfs.c
View File

@@ -1188,8 +1188,8 @@ int len;
} }
chpt++; chpt++;
} else { } else {
*puid = RPCIOD_DEFAULT_ID; *puid = geteuid();
*pgid = RPCIOD_DEFAULT_ID; *pgid = getegid();
chpt = *pPath; chpt = *pPath;
} }
if ( pHost ) if ( pHost )
@@ -1883,6 +1883,7 @@ int rv = 0;
struct timeval now; struct timeval now;
diropres res; diropres res;
NfsNode node = parentloc->node_access; NfsNode node = parentloc->node_access;
Nfs nfs = node->nfs;
mode_t type = S_IFMT & mode; mode_t type = S_IFMT & mode;
char *dupname; char *dupname;
@@ -1901,16 +1902,15 @@ char *dupname;
SERP_ARGS(node).createarg.name = dupname; SERP_ARGS(node).createarg.name = dupname;
SERP_ARGS(node).createarg.attributes.mode = mode; SERP_ARGS(node).createarg.attributes.mode = mode;
/* TODO: either use our uid or use the Nfs credentials */ SERP_ARGS(node).createarg.attributes.uid = nfs->uid;
SERP_ARGS(node).createarg.attributes.uid = 0; SERP_ARGS(node).createarg.attributes.gid = nfs->gid;
SERP_ARGS(node).createarg.attributes.gid = 0;
SERP_ARGS(node).createarg.attributes.size = 0; SERP_ARGS(node).createarg.attributes.size = 0;
SERP_ARGS(node).createarg.attributes.atime.seconds = now.tv_sec; SERP_ARGS(node).createarg.attributes.atime.seconds = now.tv_sec;
SERP_ARGS(node).createarg.attributes.atime.useconds = now.tv_usec; SERP_ARGS(node).createarg.attributes.atime.useconds = now.tv_usec;
SERP_ARGS(node).createarg.attributes.mtime.seconds = now.tv_sec; SERP_ARGS(node).createarg.attributes.mtime.seconds = now.tv_sec;
SERP_ARGS(node).createarg.attributes.mtime.useconds = now.tv_usec; SERP_ARGS(node).createarg.attributes.mtime.useconds = now.tv_usec;
if ( nfscall( node->nfs->server, if ( nfscall( nfs->server,
(type == S_IFDIR) ? NFSPROC_MKDIR : NFSPROC_CREATE, (type == S_IFDIR) ? NFSPROC_MKDIR : NFSPROC_CREATE,
(xdrproc_t)xdr_createargs, &SERP_FILE(node), (xdrproc_t)xdr_createargs, &SERP_FILE(node),
(xdrproc_t)xdr_diropres, &res) (xdrproc_t)xdr_diropres, &res)
@@ -1976,6 +1976,7 @@ int rv = 0;
struct timeval now; struct timeval now;
nfsstat status; nfsstat status;
NfsNode node = parentloc->node_access; NfsNode node = parentloc->node_access;
Nfs nfs = node->nfs;
char *dupname; char *dupname;
dupname = nfs_dupname(name, namelen); dupname = nfs_dupname(name, namelen);
@@ -1992,16 +1993,15 @@ char *dupname;
SERP_ARGS(node).symlinkarg.to = (nfspath) target; SERP_ARGS(node).symlinkarg.to = (nfspath) target;
SERP_ARGS(node).symlinkarg.attributes.mode = S_IFLNK | S_IRWXU | S_IRWXG | S_IRWXO; SERP_ARGS(node).symlinkarg.attributes.mode = S_IFLNK | S_IRWXU | S_IRWXG | S_IRWXO;
/* TODO */ SERP_ARGS(node).symlinkarg.attributes.uid = nfs->uid;
SERP_ARGS(node).symlinkarg.attributes.uid = 0; SERP_ARGS(node).symlinkarg.attributes.gid = nfs->gid;
SERP_ARGS(node).symlinkarg.attributes.gid = 0;
SERP_ARGS(node).symlinkarg.attributes.size = 0; SERP_ARGS(node).symlinkarg.attributes.size = 0;
SERP_ARGS(node).symlinkarg.attributes.atime.seconds = now.tv_sec; SERP_ARGS(node).symlinkarg.attributes.atime.seconds = now.tv_sec;
SERP_ARGS(node).symlinkarg.attributes.atime.useconds = now.tv_usec; SERP_ARGS(node).symlinkarg.attributes.atime.useconds = now.tv_usec;
SERP_ARGS(node).symlinkarg.attributes.mtime.seconds = now.tv_sec; SERP_ARGS(node).symlinkarg.attributes.mtime.seconds = now.tv_sec;
SERP_ARGS(node).symlinkarg.attributes.mtime.useconds = now.tv_usec; SERP_ARGS(node).symlinkarg.attributes.mtime.useconds = now.tv_usec;
if ( nfscall( node->nfs->server, if ( nfscall( nfs->server,
NFSPROC_SYMLINK, NFSPROC_SYMLINK,
(xdrproc_t)xdr_symlinkargs, &SERP_FILE(node), (xdrproc_t)xdr_symlinkargs, &SERP_FILE(node),
(xdrproc_t)xdr_nfsstat, &status) (xdrproc_t)xdr_nfsstat, &status)