summaryrefslogtreecommitdiffstats
path: root/xlators/nfs
diff options
context:
space:
mode:
authorCsaba Henk <csaba@gluster.com>2012-01-13 06:12:11 +0100
committerAnand Avati <avati@gluster.com>2012-01-21 05:33:19 -0800
commit4e92c58d27b5cea9d7346d6dd88be9b3479c9e3b (patch)
treef8406780ca5b4dd969424dfcde696812eb19d92e /xlators/nfs
parentd3ca9f05ec3a9881b5aeadb7b61cfcb97dbdb718 (diff)
rpc: extend actors with flag signing if privilege is required
Currently we allow the following RPC messages for unprivileged users: GLUSTER_CLI_GETWD, GLUSTER_CLI_MOUNT, GLUSTER_CLI_UMOUNT Change-Id: I05414f3ca7cbe47de45c5e5cfba1537efc774e6c BUG: 781256 Signed-off-by: Csaba Henk <csaba@gluster.com> Reviewed-on: http://review.gluster.com/2641 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@gluster.com>
Diffstat (limited to 'xlators/nfs')
-rw-r--r--xlators/nfs/server/src/mount3.c24
-rw-r--r--xlators/nfs/server/src/nfs3.c44
2 files changed, 34 insertions, 34 deletions
diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c
index 41698058e48..0f14c8d5a03 100644
--- a/xlators/nfs/server/src/mount3.c
+++ b/xlators/nfs/server/src/mount3.c
@@ -1754,12 +1754,12 @@ out:
}
rpcsvc_actor_t mnt3svc_actors[MOUNT3_PROC_COUNT] = {
- {"NULL", MOUNT3_NULL, mnt3svc_null, NULL, NULL},
- {"MNT", MOUNT3_MNT, mnt3svc_mnt, NULL, NULL},
- {"DUMP", MOUNT3_DUMP, mnt3svc_dump, NULL, NULL},
- {"UMNT", MOUNT3_UMNT, mnt3svc_umnt, NULL, NULL},
- {"UMNTALL", MOUNT3_UMNTALL, mnt3svc_umntall, NULL, NULL},
- {"EXPORT", MOUNT3_EXPORT, mnt3svc_export, NULL, NULL}
+ {"NULL", MOUNT3_NULL, mnt3svc_null, NULL, NULL, 0},
+ {"MNT", MOUNT3_MNT, mnt3svc_mnt, NULL, NULL, 0},
+ {"DUMP", MOUNT3_DUMP, mnt3svc_dump, NULL, NULL, 0},
+ {"UMNT", MOUNT3_UMNT, mnt3svc_umnt, NULL, NULL, 0},
+ {"UMNTALL", MOUNT3_UMNTALL, mnt3svc_umntall, NULL, NULL, 0},
+ {"EXPORT", MOUNT3_EXPORT, mnt3svc_export, NULL, NULL, 0}
};
@@ -1842,12 +1842,12 @@ err:
rpcsvc_actor_t mnt1svc_actors[MOUNT1_PROC_COUNT] = {
- {"NULL", MOUNT1_NULL, mnt3svc_null, NULL, NULL},
- {{0}, },
- {"DUMP", MOUNT1_DUMP, mnt3svc_dump, NULL, NULL},
- {"UMNT", MOUNT1_UMNT, mnt3svc_umnt, NULL, NULL},
- {{0}, },
- {"EXPORT", MOUNT1_EXPORT, mnt3svc_export, NULL, NULL}
+ {"NULL", MOUNT1_NULL, mnt3svc_null, NULL, NULL, 0},
+ {{0, 0}, },
+ {"DUMP", MOUNT1_DUMP, mnt3svc_dump, NULL, NULL, 0},
+ {"UMNT", MOUNT1_UMNT, mnt3svc_umnt, NULL, NULL, 0},
+ {{0, 0}, },
+ {"EXPORT", MOUNT1_EXPORT, mnt3svc_export, NULL, NULL, 0}
};
rpcsvc_program_t mnt1prog = {
diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c
index 3c540b36fe4..422646bc02b 100644
--- a/xlators/nfs/server/src/nfs3.c
+++ b/xlators/nfs/server/src/nfs3.c
@@ -5063,28 +5063,28 @@ rpcerr:
rpcsvc_actor_t nfs3svc_actors[NFS3_PROC_COUNT] = {
- {"NULL", NFS3_NULL, nfs3svc_null, NULL, NULL},
- {"GETATTR", NFS3_GETATTR, nfs3svc_getattr,NULL, NULL},
- {"SETATTR", NFS3_SETATTR, nfs3svc_setattr,NULL, NULL},
- {"LOOKUP", NFS3_LOOKUP, nfs3svc_lookup, NULL, NULL},
- {"ACCESS", NFS3_ACCESS, nfs3svc_access, NULL, NULL},
- {"READLINK", NFS3_READLINK, nfs3svc_readlink,NULL, NULL},
- {"READ", NFS3_READ, nfs3svc_read, NULL, NULL},
- {"WRITE", NFS3_WRITE, nfs3svc_write, nfs3svc_write_vec, nfs3svc_write_vecsizer},
- {"CREATE", NFS3_CREATE, nfs3svc_create, NULL, NULL},
- {"MKDIR", NFS3_MKDIR, nfs3svc_mkdir, NULL, NULL},
- {"SYMLINK", NFS3_SYMLINK, nfs3svc_symlink,NULL, NULL},
- {"MKNOD", NFS3_MKNOD, nfs3svc_mknod, NULL, NULL},
- {"REMOVE", NFS3_REMOVE, nfs3svc_remove, NULL, NULL},
- {"RMDIR", NFS3_RMDIR, nfs3svc_rmdir, NULL, NULL},
- {"RENAME", NFS3_RENAME, nfs3svc_rename, NULL, NULL},
- {"LINK", NFS3_LINK, nfs3svc_link, NULL, NULL},
- {"READDIR", NFS3_READDIR, nfs3svc_readdir,NULL, NULL},
- {"READDIRPLUS", NFS3_READDIRP, nfs3svc_readdirp,NULL, NULL},
- {"FSSTAT", NFS3_FSSTAT, nfs3svc_fsstat, NULL, NULL},
- {"FSINFO", NFS3_FSINFO, nfs3svc_fsinfo, NULL, NULL},
- {"PATHCONF", NFS3_PATHCONF, nfs3svc_pathconf,NULL, NULL},
- {"COMMIT", NFS3_COMMIT, nfs3svc_commit, NULL, NULL}
+ {"NULL", NFS3_NULL, nfs3svc_null, NULL, NULL, 0},
+ {"GETATTR", NFS3_GETATTR, nfs3svc_getattr,NULL, NULL, 0},
+ {"SETATTR", NFS3_SETATTR, nfs3svc_setattr,NULL, NULL, 0},
+ {"LOOKUP", NFS3_LOOKUP, nfs3svc_lookup, NULL, NULL, 0},
+ {"ACCESS", NFS3_ACCESS, nfs3svc_access, NULL, NULL, 0},
+ {"READLINK", NFS3_READLINK, nfs3svc_readlink,NULL, NULL, 0},
+ {"READ", NFS3_READ, nfs3svc_read, NULL, NULL, 0},
+ {"WRITE", NFS3_WRITE, nfs3svc_write, nfs3svc_write_vec, nfs3svc_write_vecsizer, 0},
+ {"CREATE", NFS3_CREATE, nfs3svc_create, NULL, NULL, 0},
+ {"MKDIR", NFS3_MKDIR, nfs3svc_mkdir, NULL, NULL, 0},
+ {"SYMLINK", NFS3_SYMLINK, nfs3svc_symlink,NULL, NULL, 0},
+ {"MKNOD", NFS3_MKNOD, nfs3svc_mknod, NULL, NULL, 0},
+ {"REMOVE", NFS3_REMOVE, nfs3svc_remove, NULL, NULL, 0},
+ {"RMDIR", NFS3_RMDIR, nfs3svc_rmdir, NULL, NULL, 0},
+ {"RENAME", NFS3_RENAME, nfs3svc_rename, NULL, NULL, 0},
+ {"LINK", NFS3_LINK, nfs3svc_link, NULL, NULL, 0},
+ {"READDIR", NFS3_READDIR, nfs3svc_readdir,NULL, NULL, 0},
+ {"READDIRPLUS", NFS3_READDIRP, nfs3svc_readdirp,NULL, NULL, 0},
+ {"FSSTAT", NFS3_FSSTAT, nfs3svc_fsstat, NULL, NULL, 0},
+ {"FSINFO", NFS3_FSINFO, nfs3svc_fsinfo, NULL, NULL, 0},
+ {"PATHCONF", NFS3_PATHCONF, nfs3svc_pathconf,NULL, NULL, 0},
+ {"COMMIT", NFS3_COMMIT, nfs3svc_commit, NULL, NULL, 0}
};