[Pvfs2-cvs] commit by nlmills in pvfs2/src/client/sysint: acache.c
acache.h client-state-machine.c client-state-machine.h
fs-add.sm getparent.c mgmt-create-dirent.sm
mgmt-event-mon-list.sm mgmt-get-config.c
mgmt-get-dfile-array.sm mgmt-get-dirdata-handle.sm
mgmt-iterate-handles-list.sm mgmt-misc.c mgmt-noop.sm
mgmt-perf-mon-list.sm mgmt-remove-dirent.sm
mgmt-remove-object.sm mgmt-repair-file.sm
mgmt-setparam-list.sm mgmt-statfs-list.sm
pint-sysdev-unexp.sm pint-sysint-utils.c pint-sysint-utils.h
remove.sm server-get-config.sm sys-create.sm sys-del-eattr.sm
sys-flush.sm sys-get-eattr.sm sys-io.sm sys-list-eattr.sm
sys-lookup.sm sys-mkdir.sm sys-readdir.sm sys-readdirplus.sm
sys-remove.sm sys-rename.sm sys-set-eattr.sm sys-setattr.sm
sys-small-io.sm sys-statfs.sm sys-symlink.sm sys-truncate.sm
CVS commit program
cvs at parl.clemson.edu
Mon Jul 21 18:02:48 EDT 2008
Update of /anoncvs/pvfs2/src/client/sysint
In directory parlweb1:/tmp/cvs-serv23746/src/client/sysint
Modified Files:
Tag: cu-security-branch
acache.c acache.h client-state-machine.c
client-state-machine.h fs-add.sm getparent.c
mgmt-create-dirent.sm mgmt-event-mon-list.sm mgmt-get-config.c
mgmt-get-dfile-array.sm mgmt-get-dirdata-handle.sm
mgmt-iterate-handles-list.sm mgmt-misc.c mgmt-noop.sm
mgmt-perf-mon-list.sm mgmt-remove-dirent.sm
mgmt-remove-object.sm mgmt-repair-file.sm
mgmt-setparam-list.sm mgmt-statfs-list.sm pint-sysdev-unexp.sm
pint-sysint-utils.c pint-sysint-utils.h remove.sm
server-get-config.sm sys-create.sm sys-del-eattr.sm
sys-flush.sm sys-get-eattr.sm sys-io.sm sys-list-eattr.sm
sys-lookup.sm sys-mkdir.sm sys-readdir.sm sys-readdirplus.sm
sys-remove.sm sys-rename.sm sys-set-eattr.sm sys-setattr.sm
sys-small-io.sm sys-statfs.sm sys-symlink.sm sys-truncate.sm
Log Message:
updated all references in include/, src/client/, src/common/, src/io/,
src/proto/, and src/server/ to use the new PVFS_credential in place of the
old PVFS_credentials. the admin apps in particular need to be updated to use
the new API.
Index: acache.c
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/acache.c,v
diff -p -u -r1.30 -r1.30.2.1
--- acache.c 6 Mar 2008 20:40:59 -0000 1.30
+++ acache.c 21 Jul 2008 22:02:47 -0000 1.30.2.1
@@ -1,5 +1,5 @@
/*
- * Copyright © Acxiom Corporation, 2005
+ * Copyright Acxiom Corporation, 2005
*
* See COPYING in top-level directory.
*/
Index: acache.h
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/acache.h,v
diff -p -u -r1.14 -r1.14.2.1
--- acache.h 6 Mar 2008 20:40:59 -0000 1.14
+++ acache.h 21 Jul 2008 22:02:47 -0000 1.14.2.1
@@ -1,5 +1,5 @@
/*
- * Copyright © Acxiom Corporation, 2005
+ * Copyright Acxiom Corporation, 2005
*
* See COPYING in top-level directory.
*/
Index: client-state-machine.c
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/client-state-machine.c,v
diff -p -u -r1.94.2.2 -r1.94.2.3
--- client-state-machine.c 22 May 2008 18:24:02 -0000 1.94.2.2
+++ client-state-machine.c 21 Jul 2008 22:02:47 -0000 1.94.2.3
@@ -25,6 +25,7 @@
#include "id-generator.h"
#include "ncache.h"
#include "acache.h"
+#include "security-util.h"
#define MAX_RETURNED_JOBS 256
@@ -792,7 +793,7 @@ void PINT_sys_release(PVFS_sys_op_id op_
{
PINT_smcb *smcb;
PINT_client_sm *sm_p;
- PVFS_credentials *cred_p;
+ PVFS_credential *newcred_p;
gossip_debug(GOSSIP_CLIENT_DEBUG, "%s: id %lld\n", __func__, lld(op_id));
smcb = PINT_id_gen_safe_lookup(op_id);
@@ -803,18 +804,18 @@ void PINT_sys_release(PVFS_sys_op_id op_
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
if (sm_p == NULL)
{
- cred_p = NULL;
+ newcred_p = NULL;
}
else
{
- cred_p = sm_p->cred_p;
+ newcred_p = sm_p->newcred_p;
}
PINT_id_gen_safe_unregister(op_id);
- if (PINT_smcb_op(smcb) && cred_p)
+ if (PINT_smcb_op(smcb) && newcred_p)
{
- PVFS_util_release_credentials(cred_p);
- if (sm_p) sm_p->cred_p = NULL;
+ PINT_release_credential(newcred_p);
+ if (sm_p) sm_p->newcred_p = NULL;
}
PINT_smcb_free(smcb);
Index: client-state-machine.h
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/client-state-machine.h,v
diff -p -u -r1.173.4.2 -r1.173.4.3
--- client-state-machine.h 15 Jul 2008 21:09:29 -0000 1.173.4.2
+++ client-state-machine.h 21 Jul 2008 22:02:47 -0000 1.173.4.3
@@ -28,6 +28,7 @@
#include "pint-sysint-utils.h"
#include "pint-perf-counter.h"
#include "state-machine.h"
+#include "security-util.h"
#define MAX_LOOKUP_SEGMENTS PVFS_REQ_LIMIT_PATH_SEGMENT_COUNT
#define MAX_LOOKUP_CONTEXTS PVFS_REQ_LIMIT_MAX_SYMLINK_RESOLUTION_COUNT
@@ -515,7 +516,6 @@ typedef struct PINT_client_sm
PVFS_object_ref object_ref;
PVFS_object_ref parent_ref;
- PVFS_credentials *cred_p;
PVFS_credential *newcred_p;
union
{
@@ -663,23 +663,6 @@ void PINT_sys_release(PVFS_sys_op_id op_
void PINT_mgmt_release(PVFS_mgmt_op_id op_id);
/* internal helper macros */
-#define PINT_init_sysint_credentials(sm_p_cred_p, user_cred_p)\
-do { \
- if (user_cred_p == NULL) \
- { \
- gossip_lerr("Invalid user credentials! (nil)\n"); \
- free(sm_p); \
- return -PVFS_EINVAL; \
- } \
- sm_p_cred_p = PVFS_util_dup_credentials(user_cred_p); \
- if (!sm_p_cred_p) \
- { \
- gossip_lerr("Failed to copy user credentials\n"); \
- free(sm_p); \
- return -PVFS_ENOMEM; \
- } \
-} while(0)
-
#define PINT_init_sysint_credential(sm_p_newcred_p, user_newcred_p) \
do \
{ \
Index: fs-add.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/fs-add.sm,v
diff -p -u -r1.18.2.1 -r1.18.2.2
--- fs-add.sm 16 May 2008 15:15:30 -0000 1.18.2.1
+++ fs-add.sm 21 Jul 2008 22:02:47 -0000 1.18.2.2
@@ -36,6 +36,7 @@
#include "server-config-mgr.h"
#include "client-state-machine.h"
#include "pint-util.h"
+#include "security-util.h"
enum {
SKIP_INTEGRITY_CHECK = 1
@@ -100,9 +101,10 @@ PVFS_error PVFS_isys_fs_add(
PVFS_BMI_addr_t test_addr;
PINT_smcb *smcb = NULL;
PINT_client_sm *sm_p = NULL;
- PVFS_credentials creds;
+ PVFS_credential *cred;
- PVFS_util_gen_credentials(&creds);
+ /* TODO: move the credential generation somewhere else (like argument) */
+ cred = PVFS_util_gen_fake_credential();
gen_mutex_lock(&mt_config);
@@ -178,7 +180,7 @@ PVFS_error PVFS_isys_fs_add(
sm_p->msgarray_op.params.retry_limit = 5; /* retry up to 5 times */
PINT_msgpair_init(&sm_p->msgarray_op);
- PINT_init_sysint_credentials(sm_p->cred_p, &creds);
+ PINT_init_sysint_credential(sm_p->newcred_p, cred);
return PINT_client_state_machine_post(
smcb, op_id, user_ptr);
@@ -255,7 +257,8 @@ static PINT_sm_action pvfs2_server_prepa
assert(js_p->error_code == 0);
fsid = sm_p->u.get_config.mntent->fs_id;
ret = PVFS_mgmt_count_servers(
- fsid, sm_p->cred_p, PVFS_MGMT_IO_SERVER | PVFS_MGMT_META_SERVER, &count);
+ fsid, sm_p->newcred_p, PVFS_MGMT_IO_SERVER | PVFS_MGMT_META_SERVER,
+ &count);
if (ret < 0)
{
PVFS_perror("PVFS_mgmt_count_servers()", ret);
@@ -276,8 +279,11 @@ static PINT_sm_action pvfs2_server_prepa
return SM_ACTION_COMPLETE;
}
- ret = PVFS_mgmt_get_server_array(fsid, sm_p->cred_p,
- PVFS_MGMT_IO_SERVER | PVFS_MGMT_META_SERVER, sm_p->fetch_config.addr_array, &count);
+ ret = PVFS_mgmt_get_server_array(fsid, sm_p->newcred_p,
+ PVFS_MGMT_IO_SERVER |
+ PVFS_MGMT_META_SERVER,
+ sm_p->fetch_config.addr_array,
+ &count);
if (ret < 0)
{
PVFS_perror("PVFS_mgmt_get_server_array()", ret);
@@ -370,8 +376,9 @@ static int compare_hashes(PINT_client_sm
for (i = 0; i < count; i++)
{
gossip_err(" FS config file on %s -> (size) %d\n",
- PVFS_mgmt_map_addr(fsid, sm_p->cred_p, sm_p->fetch_config.addr_array[i], &tmp),
- sm_p->fetch_config.fs_config_buf_size[i] - 1);
+ PVFS_mgmt_map_addr(fsid, sm_p->newcred_p,
+ sm_p->fetch_config.addr_array[i], &tmp),
+ sm_p->fetch_config.fs_config_buf_size[i] - 1);
ret = -PVFS_EINVAL;
}
goto out;
@@ -400,7 +407,9 @@ static int compare_hashes(PINT_client_sm
unsigned char str[256];
hash2str((unsigned char *) sha1_fs_digests[i], digest_len, str);
gossip_err(" FS config file on %s -> (SHA1) %s\n",
- PVFS_mgmt_map_addr(fsid, sm_p->cred_p, sm_p->fetch_config.addr_array[i], &tmp), str);
+ PVFS_mgmt_map_addr(fsid, sm_p->newcred_p,
+ sm_p->fetch_config.addr_array[i],
+ &tmp), str);
}
ret = -PVFS_EINVAL;
goto out;
Index: getparent.c
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/getparent.c,v
diff -p -u -r1.13 -r1.13.20.1
--- getparent.c 16 Sep 2006 21:13:14 -0000 1.13
+++ getparent.c 21 Jul 2008 22:02:47 -0000 1.13.20.1
@@ -10,11 +10,12 @@
#include "str-utils.h"
#include "gossip.h"
#include "pvfs2-util.h"
+#include "security-types.h"
int PVFS_sys_getparent(
PVFS_fs_id fs_id,
char *entry_name,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sysresp_getparent *resp)
{
int ret = -PVFS_EINVAL;
@@ -37,7 +38,7 @@ int PVFS_sys_getparent(
}
memset(&resp_look,0,sizeof(PVFS_sysresp_lookup));
- ret = PVFS_sys_lookup(fs_id, parent_buf, credentials,
+ ret = PVFS_sys_lookup(fs_id, parent_buf, credential,
&resp_look, PVFS2_LOOKUP_LINK_NO_FOLLOW);
if (ret)
{
Index: mgmt-create-dirent.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/mgmt-create-dirent.sm,v
diff -p -u -r1.17.8.1 -r1.17.8.2
--- mgmt-create-dirent.sm 16 May 2008 15:15:30 -0000 1.17.8.1
+++ mgmt-create-dirent.sm 21 Jul 2008 22:02:47 -0000 1.17.8.2
@@ -23,6 +23,7 @@
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
#include "pvfs2-internal.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -67,7 +68,7 @@ PVFS_error PVFS_imgmt_create_dirent(
PVFS_object_ref parent_ref,
char *entry,
PVFS_handle entry_handle,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
PVFS_mgmt_op_id *op_id,
void *user_ptr)
{
@@ -98,7 +99,7 @@ PVFS_error PVFS_imgmt_create_dirent(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, parent_ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->parent_ref = parent_ref;
sm_p->u.mgmt_create_dirent.entry = entry;
sm_p->u.mgmt_create_dirent.entry_handle = entry_handle;
@@ -118,7 +119,7 @@ PVFS_error PVFS_mgmt_create_dirent(
PVFS_object_ref parent_ref,
char *entry,
PVFS_handle entry_handle,
- PVFS_credentials *credentials)
+ PVFS_credential *credential)
{
PVFS_error ret = -PVFS_EINVAL, error = 0;
PVFS_mgmt_op_id op_id;
@@ -127,7 +128,7 @@ PVFS_error PVFS_mgmt_create_dirent(
"PVFS_mgmt_create_dirent entered\n");
ret = PVFS_imgmt_create_dirent(
- parent_ref, entry, entry_handle, credentials, &op_id, NULL);
+ parent_ref, entry, entry_handle, credential, &op_id, NULL);
if (ret)
{
PVFS_perror_gossip("PVFS_imgmt_create_dirent call", ret);
@@ -164,6 +165,9 @@ static int mgmt_create_dirent_setup_msgp
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
js_p->error_code = 0;
@@ -179,7 +183,7 @@ static int mgmt_create_dirent_setup_msgp
PINT_SERVREQ_CRDIRENT_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->u.mgmt_create_dirent.entry,
sm_p->u.mgmt_create_dirent.entry_handle,
sm_p->parent_ref.handle,
Index: mgmt-event-mon-list.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/mgmt-event-mon-list.sm,v
diff -p -u -r1.30.8.1 -r1.30.8.2
--- mgmt-event-mon-list.sm 16 May 2008 15:15:30 -0000 1.30.8.1
+++ mgmt-event-mon-list.sm 21 Jul 2008 22:02:47 -0000 1.30.8.2
@@ -21,6 +21,7 @@
#include "pvfs2-mgmt.h"
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -56,7 +57,7 @@ machine pvfs2_client_mgmt_event_mon_list
PVFS_error PVFS_imgmt_event_mon_list(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
struct PVFS_mgmt_event** event_matrix,
PVFS_BMI_addr_t *addr_array,
int server_count,
@@ -90,7 +91,7 @@ PVFS_error PVFS_imgmt_event_mon_list(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.event_mon_list.fs_id = fs_id;
sm_p->u.event_mon_list.event_matrix = event_matrix;
sm_p->u.event_mon_list.server_count = server_count;
@@ -111,7 +112,7 @@ PVFS_error PVFS_imgmt_event_mon_list(
PVFS_error PVFS_mgmt_event_mon_list(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
struct PVFS_mgmt_event** event_matrix,
PVFS_BMI_addr_t *addr_array,
int server_count,
@@ -125,7 +126,7 @@ PVFS_error PVFS_mgmt_event_mon_list(
"PVFS_mgmt_event_mon_list entered\n");
ret = PVFS_imgmt_event_mon_list(
- fs_id, credentials, event_matrix, addr_array, server_count,
+ fs_id, credential, event_matrix, addr_array, server_count,
event_count, details, &op_id, NULL);
if (ret)
@@ -156,6 +157,9 @@ static PINT_sm_action mgmt_event_mon_lis
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int i = 0;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG, "event_mon_list state: "
"mgmt_event_mon_list_setup_msgpair\n");
@@ -166,7 +170,7 @@ static PINT_sm_action mgmt_event_mon_lis
{
PINT_SERVREQ_MGMT_EVENT_MON_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->u.event_mon_list.event_count);
msg_p->fs_id = sm_p->u.event_mon_list.fs_id;
Index: mgmt-get-config.c
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/mgmt-get-config.c,v
diff -p -u -r1.6.2.1 -r1.6.2.2
--- mgmt-get-config.c 16 May 2008 15:15:30 -0000 1.6.2.1
+++ mgmt-get-config.c 21 Jul 2008 22:02:47 -0000 1.6.2.2
@@ -16,6 +16,7 @@
#include "str-utils.h"
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -36,7 +37,7 @@ int PVFS_mgmt_get_config(
PINT_smcb *smcb = NULL;
PINT_client_sm *sm_p = NULL;
PVFS_error error = 0;
- PVFS_credentials creds;
+ PVFS_credential *cred;
struct filesystem_configuration_s *cur_fs = NULL;
PVFS_sys_op_id op_id;
struct server_configuration_s *config = NULL;
@@ -45,7 +46,9 @@ int PVFS_mgmt_get_config(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_mgmt_get_config entered\n");
- PVFS_util_gen_credentials(&creds);
+ /* TODO: get credential from arguments */
+ cred = PVFS_util_gen_fake_credential();
+ assert(cred);
PINT_smcb_alloc(&smcb, PVFS_SERVER_GET_CONFIG,
sizeof(struct PINT_client_sm),
@@ -63,7 +66,7 @@ int PVFS_mgmt_get_config(
PINT_init_msgarray_params(sm_p, *fsid);
- PINT_init_sysint_credentials(sm_p->cred_p, &creds);
+ PINT_init_sysint_credential(sm_p->newcred_p, cred);
config = PINT_get_server_config_struct(*fsid);
Index: mgmt-get-dfile-array.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/mgmt-get-dfile-array.sm,v
diff -p -u -r1.32.8.1 -r1.32.8.2
--- mgmt-get-dfile-array.sm 16 May 2008 15:15:30 -0000 1.32.8.1
+++ mgmt-get-dfile-array.sm 21 Jul 2008 22:02:47 -0000 1.32.8.2
@@ -24,6 +24,7 @@
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
#include "pint-util.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -51,7 +52,7 @@ machine pvfs2_client_mgmt_get_dfile_arra
*/
PVFS_error PVFS_imgmt_get_dfile_array(
PVFS_object_ref ref,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
PVFS_handle *dfile_array,
int dfile_count,
PVFS_mgmt_op_id *op_id,
@@ -81,7 +82,7 @@ PVFS_error PVFS_imgmt_get_dfile_array(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->object_ref = ref;
sm_p->u.get_dfile_array.dfile_array = dfile_array;
sm_p->u.get_dfile_array.dfile_count = dfile_count;
@@ -101,7 +102,7 @@ PVFS_error PVFS_imgmt_get_dfile_array(
*/
PVFS_error PVFS_mgmt_get_dfile_array(
PVFS_object_ref ref,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
PVFS_handle *dfile_array,
int dfile_count)
{
@@ -112,7 +113,7 @@ PVFS_error PVFS_mgmt_get_dfile_array(
"PVFS_mgmt_get_dfile_array entered\n");
ret = PVFS_imgmt_get_dfile_array(
- ref, credentials, dfile_array, dfile_count, &op_id, NULL);
+ ref, credential, dfile_array, dfile_count, &op_id, NULL);
if (ret)
{
Index: mgmt-get-dirdata-handle.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/mgmt-get-dirdata-handle.sm,v
diff -p -u -r1.13.8.2 -r1.13.8.3
--- mgmt-get-dirdata-handle.sm 20 Jun 2008 19:13:24 -0000 1.13.8.2
+++ mgmt-get-dirdata-handle.sm 21 Jul 2008 22:02:47 -0000 1.13.8.3
@@ -25,6 +25,7 @@
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
#include "pvfs2-internal.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -69,7 +70,7 @@ machine pvfs2_client_mgmt_get_dirdata_ha
PVFS_error PVFS_imgmt_get_dirdata_handle(
PVFS_object_ref parent_ref,
PVFS_handle *out_dirdata_handle,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
PVFS_mgmt_op_id *op_id,
void *user_ptr)
{
@@ -99,7 +100,7 @@ PVFS_error PVFS_imgmt_get_dirdata_handle
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, parent_ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->parent_ref = parent_ref;
sm_p->u.mgmt_get_dirdata_handle.dirdata_handle = out_dirdata_handle;
@@ -116,7 +117,7 @@ PVFS_error PVFS_imgmt_get_dirdata_handle
PVFS_error PVFS_mgmt_get_dirdata_handle(
PVFS_object_ref parent_ref,
PVFS_handle *out_dirdata_handle,
- PVFS_credentials *credentials)
+ PVFS_credential *credential)
{
PVFS_error ret = -PVFS_EINVAL, error = 0;
PVFS_mgmt_op_id op_id;
@@ -125,7 +126,7 @@ PVFS_error PVFS_mgmt_get_dirdata_handle(
"PVFS_mgmt_get_dirdata_handle entered\n");
ret = PVFS_imgmt_get_dirdata_handle(
- parent_ref, out_dirdata_handle, credentials, &op_id, NULL);
+ parent_ref, out_dirdata_handle, credential, &op_id, NULL);
if (ret)
{
PVFS_perror_gossip("PVFS_imgmt_get_dirdata_handle call", ret);
@@ -158,6 +159,9 @@ static int mgmt_get_dirdata_handle_setup
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
js_p->error_code = 0;
@@ -166,7 +170,7 @@ static int mgmt_get_dirdata_handle_setup
PINT_SERVREQ_MGMT_GET_DIRDATA_HANDLE_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->parent_ref.fs_id,
sm_p->parent_ref.handle);
Index: mgmt-iterate-handles-list.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/mgmt-iterate-handles-list.sm,v
diff -p -u -r1.29.8.1 -r1.29.8.2
--- mgmt-iterate-handles-list.sm 16 May 2008 15:15:30 -0000 1.29.8.1
+++ mgmt-iterate-handles-list.sm 21 Jul 2008 22:02:47 -0000 1.29.8.2
@@ -18,6 +18,7 @@
#include "pvfs2-types.h"
#include "pvfs2-mgmt.h"
#include "server-config.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -58,7 +59,7 @@ machine pvfs2_client_mgmt_iterate_handle
*/
PVFS_error PVFS_imgmt_iterate_handles_list(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential ,
PVFS_handle **handle_matrix,
int *handle_count_array,
PVFS_ds_position *position_array,
@@ -93,7 +94,7 @@ PVFS_error PVFS_imgmt_iterate_handles_li
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.iterate_handles_list.fs_id = fs_id;
sm_p->u.iterate_handles_list.server_count = server_count;
sm_p->u.iterate_handles_list.addr_array = addr_array;
@@ -117,7 +118,7 @@ PVFS_error PVFS_imgmt_iterate_handles_li
*/
PVFS_error PVFS_mgmt_iterate_handles_list(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
PVFS_handle **handle_matrix,
int *handle_count_array,
PVFS_ds_position *position_array,
@@ -132,7 +133,7 @@ PVFS_error PVFS_mgmt_iterate_handles_lis
"PVFS_mgmt_iterate_handles_list entered\n");
ret = PVFS_imgmt_iterate_handles_list(
- fs_id, credentials, handle_matrix, handle_count_array,
+ fs_id, credential, handle_matrix, handle_count_array,
position_array, addr_array, server_count, details, &op_id, NULL);
if (ret)
@@ -163,6 +164,9 @@ static PINT_sm_action mgmt_iterate_handl
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int i = 0, j = 0;
PINT_sm_msgpair_state *msg_p;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG, "iterate_handles_list state: "
"mgmt_iterate_handles_list_setup_msgpair\n");
@@ -184,7 +188,7 @@ static PINT_sm_action mgmt_iterate_handl
{
PINT_SERVREQ_MGMT_ITERATE_HANDLES_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->u.iterate_handles_list.fs_id,
sm_p->u.iterate_handles_list.handle_count_array[i],
sm_p->u.iterate_handles_list.position_array[i]);
Index: mgmt-misc.c
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/mgmt-misc.c,v
diff -p -u -r1.29 -r1.29.2.1
--- mgmt-misc.c 14 Feb 2008 00:04:39 -0000 1.29
+++ mgmt-misc.c 21 Jul 2008 22:02:47 -0000 1.29.2.1
@@ -21,6 +21,7 @@
#include "pint-cached-config.h"
#include "server-config.h"
#include "client-state-machine.h"
+#include "security-types.h"
/** Maps a given opaque server address back to a string address. Also
* fills in server type.
@@ -29,7 +30,7 @@
*/
const char *PVFS_mgmt_map_addr(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
PVFS_BMI_addr_t addr,
int *server_type)
{
@@ -51,7 +52,7 @@ PVFS_error PVFS_mgmt_map_handle(
*/
PVFS_error PVFS_mgmt_statfs_all(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
struct PVFS_mgmt_server_stat *stat_array,
int *inout_count_p,
PVFS_error_details *details)
@@ -95,7 +96,7 @@ PVFS_error PVFS_mgmt_statfs_all(
}
ret = PVFS_mgmt_statfs_list(
- fs_id, credentials, stat_array, addr_array,
+ fs_id, credential, stat_array, addr_array,
real_count, details);
free(addr_array);
@@ -110,7 +111,7 @@ PVFS_error PVFS_mgmt_statfs_all(
*/
PVFS_error PVFS_mgmt_setparam_all(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
enum PVFS_server_param param,
uint64_t value,
uint64_t *old_value_array,
@@ -146,7 +147,7 @@ PVFS_error PVFS_mgmt_setparam_all(
}
ret = PVFS_mgmt_setparam_list(
- fs_id, credentials, param, value, addr_array,
+ fs_id, credential, param, value, addr_array,
old_value_array, count, details);
free(addr_array);
@@ -158,7 +159,7 @@ PVFS_error PVFS_mgmt_setparam_all(
*/
PVFS_error PVFS_mgmt_setparam_single(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
enum PVFS_server_param param,
uint64_t value,
char *server_addr_str,
@@ -171,7 +172,7 @@ PVFS_error PVFS_mgmt_setparam_single(
if (server_addr_str && (BMI_addr_lookup(&addr, server_addr_str) == 0))
{
ret = PVFS_mgmt_setparam_list(
- fs_id, credentials, param, value,
+ fs_id, credential, param, value,
&addr, old_value, 1, details);
}
return ret;
@@ -184,7 +185,7 @@ PVFS_error PVFS_mgmt_setparam_single(
*/
PVFS_error PVFS_mgmt_get_server_array(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
int server_type,
PVFS_BMI_addr_t *addr_array,
int *inout_count_p)
@@ -205,7 +206,7 @@ PVFS_error PVFS_mgmt_get_server_array(
*/
PVFS_error PVFS_mgmt_count_servers(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
int server_type,
int *count)
{
Index: mgmt-noop.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/mgmt-noop.sm,v
diff -p -u -r1.33.8.1 -r1.33.8.2
--- mgmt-noop.sm 16 May 2008 15:15:30 -0000 1.33.8.1
+++ mgmt-noop.sm 21 Jul 2008 22:02:47 -0000 1.33.8.2
@@ -23,6 +23,7 @@
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
#include "bmi.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -56,7 +57,7 @@ machine pvfs2_client_mgmt_noop_sm
*/
PVFS_error PVFS_imgmt_noop(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
PVFS_BMI_addr_t addr,
PVFS_mgmt_op_id *op_id,
void *user_ptr)
@@ -78,7 +79,7 @@ PVFS_error PVFS_imgmt_noop(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
PINT_msgpair_init(&sm_p->msgarray_op);
sm_p->msgarray_op.msgpair.fs_id = fs_id;
sm_p->msgarray_op.msgpair.retry_flag = PVFS_MSGPAIR_NO_RETRY;
@@ -95,7 +96,7 @@ PVFS_error PVFS_imgmt_noop(
*/
PVFS_error PVFS_mgmt_noop(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
PVFS_BMI_addr_t addr)
{
PVFS_error ret = -PVFS_EINVAL, error = 0;
@@ -103,7 +104,7 @@ PVFS_error PVFS_mgmt_noop(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_mgmt_noop entered\n");
- ret = PVFS_imgmt_noop(fs_id, credentials, addr, &op_id, NULL);
+ ret = PVFS_imgmt_noop(fs_id, credential, addr, &op_id, NULL);
if (ret)
{
PVFS_perror_gossip("PVFS_imgmt_noop call", ret);
@@ -127,10 +128,14 @@ static PINT_sm_action mgmt_noop_setup_ms
struct PINT_smcb *smcb, job_status_s *js_p)
{
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
+
gossip_debug(GOSSIP_CLIENT_DEBUG,
"noop state: mgmt_noop_setup_msgpair\n");
- PINT_SERVREQ_MGMT_NOOP_FILL(sm_p->msgarray_op.msgpair.req, *sm_p->cred_p);
+ PINT_SERVREQ_MGMT_NOOP_FILL(sm_p->msgarray_op.msgpair.req, xxremovemexx);
PINT_sm_push_frame(smcb, 0, &sm_p->msgarray_op);
js_p->error_code = 0;
Index: mgmt-perf-mon-list.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/mgmt-perf-mon-list.sm,v
diff -p -u -r1.34.8.1 -r1.34.8.2
--- mgmt-perf-mon-list.sm 16 May 2008 15:15:31 -0000 1.34.8.1
+++ mgmt-perf-mon-list.sm 21 Jul 2008 22:02:47 -0000 1.34.8.2
@@ -22,6 +22,7 @@
#include "pvfs2-mgmt.h"
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -58,7 +59,7 @@ machine pvfs2_client_mgmt_perf_mon_list_
*/
PVFS_error PVFS_imgmt_perf_mon_list(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
struct PVFS_mgmt_perf_stat **perf_matrix,
uint64_t *end_time_ms_array,
PVFS_BMI_addr_t *addr_array,
@@ -95,7 +96,7 @@ PVFS_error PVFS_imgmt_perf_mon_list(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.perf_mon_list.fs_id = fs_id;
sm_p->u.perf_mon_list.perf_matrix = perf_matrix;
sm_p->u.perf_mon_list.server_count = server_count;
@@ -120,7 +121,7 @@ PVFS_error PVFS_imgmt_perf_mon_list(
*/
PVFS_error PVFS_mgmt_perf_mon_list(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
struct PVFS_mgmt_perf_stat **perf_matrix,
uint64_t *end_time_ms_array,
PVFS_BMI_addr_t *addr_array,
@@ -136,7 +137,7 @@ PVFS_error PVFS_mgmt_perf_mon_list(
"PVFS_mgmt_perf_mon_list entered\n");
ret = PVFS_imgmt_perf_mon_list(
- fs_id, credentials, perf_matrix, end_time_ms_array,
+ fs_id, credential, perf_matrix, end_time_ms_array,
addr_array, next_id_array, server_count, history_count,
details, &op_id, NULL);
@@ -168,6 +169,9 @@ static PINT_sm_action mgmt_perf_mon_list
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int i = 0;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG, "perf_mon_list state: "
"mgmt_perf_mon_list_setup_msgpair\n");
@@ -177,7 +181,7 @@ static PINT_sm_action mgmt_perf_mon_list
{
PINT_SERVREQ_MGMT_PERF_MON_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->u.perf_mon_list.next_id_array[i],
sm_p->u.perf_mon_list.history_count);
Index: mgmt-remove-dirent.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/mgmt-remove-dirent.sm,v
diff -p -u -r1.14.8.1 -r1.14.8.2
--- mgmt-remove-dirent.sm 16 May 2008 15:15:31 -0000 1.14.8.1
+++ mgmt-remove-dirent.sm 21 Jul 2008 22:02:47 -0000 1.14.8.2
@@ -24,6 +24,7 @@
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
#include "pvfs2-internal.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -67,7 +68,7 @@ machine pvfs2_client_mgmt_remove_dirent_
PVFS_error PVFS_imgmt_remove_dirent(
PVFS_object_ref parent_ref,
char *entry,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
PVFS_mgmt_op_id *op_id,
void *user_ptr)
{
@@ -97,7 +98,7 @@ PVFS_error PVFS_imgmt_remove_dirent(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, parent_ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->parent_ref = parent_ref;
sm_p->u.mgmt_remove_dirent.entry = entry;
@@ -115,7 +116,7 @@ PVFS_error PVFS_imgmt_remove_dirent(
PVFS_error PVFS_mgmt_remove_dirent(
PVFS_object_ref parent_ref,
char *entry,
- PVFS_credentials *credentials)
+ PVFS_credential *credential)
{
PVFS_error ret = -PVFS_EINVAL, error = 0;
PVFS_mgmt_op_id op_id;
@@ -124,7 +125,7 @@ PVFS_error PVFS_mgmt_remove_dirent(
"PVFS_mgmt_remove_dirent entered\n");
ret = PVFS_imgmt_remove_dirent(
- parent_ref, entry, credentials, &op_id, NULL);
+ parent_ref, entry, credential, &op_id, NULL);
if (ret)
{
PVFS_perror_gossip("PVFS_imgmt_remove_dirent call", ret);
@@ -161,7 +162,10 @@ static PINT_sm_action mgmt_remove_dirent
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
+
js_p->error_code = 0;
PINT_msgpair_init(&sm_p->msgarray_op);
@@ -169,7 +173,7 @@ static PINT_sm_action mgmt_remove_dirent
PINT_SERVREQ_MGMT_REMOVE_DIRENT_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->parent_ref.fs_id,
sm_p->parent_ref.handle,
sm_p->u.mgmt_remove_dirent.entry);
Index: mgmt-remove-object.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/mgmt-remove-object.sm,v
diff -p -u -r1.14.8.1 -r1.14.8.2
--- mgmt-remove-object.sm 16 May 2008 15:15:31 -0000 1.14.8.1
+++ mgmt-remove-object.sm 21 Jul 2008 22:02:47 -0000 1.14.8.2
@@ -24,6 +24,7 @@
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
#include "pvfs2-internal.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -66,7 +67,7 @@ machine pvfs2_client_mgmt_remove_object_
*/
PVFS_error PVFS_imgmt_remove_object(
PVFS_object_ref object_ref,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
PVFS_sys_op_id *op_id,
void *user_ptr)
{
@@ -95,7 +96,7 @@ PVFS_error PVFS_imgmt_remove_object(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, object_ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->object_ref = object_ref;
gossip_debug(
@@ -113,7 +114,7 @@ PVFS_error PVFS_imgmt_remove_object(
*/
PVFS_error PVFS_mgmt_remove_object(
PVFS_object_ref object_ref,
- PVFS_credentials *credentials)
+ PVFS_credential *credential)
{
PVFS_error ret = -PVFS_EINVAL, error = 0;
PVFS_sys_op_id op_id;
@@ -121,7 +122,7 @@ PVFS_error PVFS_mgmt_remove_object(
gossip_debug(GOSSIP_CLIENT_DEBUG,
"PVFS_mgmt_remove_object entered\n");
- ret = PVFS_imgmt_remove_object(object_ref, credentials, &op_id, NULL);
+ ret = PVFS_imgmt_remove_object(object_ref, credential, &op_id, NULL);
if (ret)
{
PVFS_perror_gossip("PVFS_imgmt_remove_object call", ret);
@@ -158,6 +159,9 @@ static PINT_sm_action mgmt_remove_object
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
js_p->error_code = 0;
@@ -166,7 +170,7 @@ static PINT_sm_action mgmt_remove_object
PINT_SERVREQ_MGMT_REMOVE_OBJECT_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->object_ref.handle);
@@ -196,8 +200,7 @@ static int mgmt_remove_object_comp_fn(
void *v_p, struct PVFS_server_resp *resp_p, int index)
{
PINT_smcb *smcb = v_p;
- PINT_client_sm *sm_p __attribute__((unused)) =
- PINT_sm_frame(smcb, PINT_MSGPAIR_PARENT_SM);
+ PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_MSGPAIR_PARENT_SM);
assert(resp_p->op == PVFS_SERV_MGMT_REMOVE_OBJECT);
Index: mgmt-repair-file.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/mgmt-repair-file.sm,v
diff -p -u -r1.1.6.1 -r1.1.6.2
--- mgmt-repair-file.sm 16 May 2008 15:15:31 -0000 1.1.6.1
+++ mgmt-repair-file.sm 21 Jul 2008 22:02:47 -0000 1.1.6.2
@@ -27,6 +27,7 @@
#include "ncache.h"
#include "pvfs2-internal.h"
#include "sys-create.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -143,7 +144,7 @@ PVFS_error PVFS_imgmt_repair_file(
char *object_name,
PVFS_object_ref parent_ref,
PVFS_sys_attr attr,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
PVFS_handle handle, /*Pull in handle of dfile to create*/
PVFS_sysresp_create *resp,
PVFS_sys_op_id *op_id,
@@ -207,7 +208,7 @@ PVFS_error PVFS_imgmt_repair_file(
memset(sm_p->u.create.datafile_handles, 0,sizeof(PVFS_handle));
PINT_init_msgarray_params(sm_p, parent_ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.create.object_name = object_name;
sm_p->u.create.create_resp = resp;
sm_p->u.create.datafile_handles[0] = handle; /*Assign handle pulled in here*/
@@ -254,7 +255,7 @@ PVFS_error PVFS_mgmt_repair_file(
char *object_name,
PVFS_object_ref parent_ref,
PVFS_sys_attr attr,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
PVFS_handle handle,
PVFS_sysresp_create *resp)
{
@@ -263,7 +264,7 @@ PVFS_error PVFS_mgmt_repair_file(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_mgmt_repair_file entered\n");
- ret = PVFS_imgmt_repair_file(object_name, parent_ref, attr, credentials,
+ ret = PVFS_imgmt_repair_file(object_name, parent_ref, attr, credential,
handle, resp, &op_id, NULL);
if (ret)
{
Index: mgmt-setparam-list.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/mgmt-setparam-list.sm,v
diff -p -u -r1.36.8.1 -r1.36.8.2
--- mgmt-setparam-list.sm 16 May 2008 15:15:31 -0000 1.36.8.1
+++ mgmt-setparam-list.sm 21 Jul 2008 22:02:47 -0000 1.36.8.2
@@ -24,6 +24,7 @@
#include "str-utils.h"
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -62,7 +63,7 @@ machine pvfs2_client_mgmt_setparam_list_
*/
PVFS_error PVFS_imgmt_setparam_list(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
enum PVFS_server_param param,
uint64_t value,
PVFS_BMI_addr_t *addr_array,
@@ -96,7 +97,7 @@ PVFS_error PVFS_imgmt_setparam_list(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.setparam_list.fs_id = fs_id;
sm_p->u.setparam_list.param = param;
sm_p->u.setparam_list.value = value;
@@ -131,7 +132,7 @@ PVFS_error PVFS_imgmt_setparam_list(
*/
PVFS_error PVFS_mgmt_setparam_list(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
enum PVFS_server_param param,
uint64_t value,
PVFS_BMI_addr_t *addr_array,
@@ -145,7 +146,7 @@ PVFS_error PVFS_mgmt_setparam_list(
gossip_debug(GOSSIP_CLIENT_DEBUG, "%s entered\n", __func__);
ret = PVFS_imgmt_setparam_list(
- fs_id, credentials, param, value, addr_array, old_value_array,
+ fs_id, credential, param, value, addr_array, old_value_array,
count, details, &op_id, NULL);
if (ret)
@@ -175,6 +176,9 @@ static PINT_sm_action mgmt_setparam_list
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int i = 0;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG, "setparam_list state: "
"mgmt_setparam_list_setup_msgpair\n");
@@ -184,7 +188,7 @@ static PINT_sm_action mgmt_setparam_list
{
PINT_SERVREQ_MGMT_SETPARAM_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->u.setparam_list.fs_id,
sm_p->u.setparam_list.param,
sm_p->u.setparam_list.value);
Index: mgmt-statfs-list.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/mgmt-statfs-list.sm,v
diff -p -u -r1.43.8.1 -r1.43.8.2
--- mgmt-statfs-list.sm 16 May 2008 15:15:31 -0000 1.43.8.1
+++ mgmt-statfs-list.sm 21 Jul 2008 22:02:47 -0000 1.43.8.2
@@ -2,7 +2,7 @@
* (C) 2003 Clemson University and The University of Chicago
*
* Changes by Acxiom Corporation to add support for nonblocking statfs
- * Copyright © Acxiom Corporation, 2006.
+ * Copyright Acxiom Corporation, 2006.
*
* See COPYING in top-level directory.
*/
@@ -25,6 +25,7 @@
#include "pvfs2-mgmt.h"
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -76,7 +77,7 @@ machine pvfs2_client_mgmt_statfs_list_sm
*/
PVFS_error PVFS_imgmt_statfs_list(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
struct PVFS_mgmt_server_stat *stat_array,
PVFS_BMI_addr_t *addr_array,
int count,
@@ -108,7 +109,7 @@ PVFS_error PVFS_imgmt_statfs_list(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.statfs_list.fs_id = fs_id;
sm_p->u.statfs_list.stat_array = stat_array;
sm_p->u.statfs_list.count = count;
@@ -133,7 +134,7 @@ PVFS_error PVFS_imgmt_statfs_list(
*/
PVFS_error PVFS_mgmt_statfs_list(
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
struct PVFS_mgmt_server_stat *stat_array,
PVFS_BMI_addr_t *addr_array,
int count,
@@ -145,7 +146,7 @@ PVFS_error PVFS_mgmt_statfs_list(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_mgmt_statfs_list entered\n");
ret = PVFS_imgmt_statfs_list(
- fs_id, credentials, stat_array, addr_array, count,
+ fs_id, credential, stat_array, addr_array, count,
details, &op_id, NULL);
if (ret)
@@ -176,6 +177,9 @@ static PINT_sm_action mgmt_statfs_list_s
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int i = 0;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG,
"statfs_list state: mgmt_statfs_list_setup_msgpair\n");
@@ -186,7 +190,7 @@ static PINT_sm_action mgmt_statfs_list_s
{
PINT_SERVREQ_STATFS_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->u.statfs_list.fs_id);
msg_p->fs_id = sm_p->u.statfs_list.fs_id;
@@ -272,7 +276,7 @@ static int statfs_list_comp_fn(void *v_p
resp_stat->handles_total_count;
sm_stat->bmi_address = PVFS_mgmt_map_addr(
- sm_p->u.statfs_list.fs_id, sm_p->cred_p,
+ sm_p->u.statfs_list.fs_id, sm_p->newcred_p,
sm_p->msgarray_op.msgarray[i].svr_addr, &sm_stat->server_type);
assert(sm_stat->bmi_address);
Index: pint-sysdev-unexp.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/pint-sysdev-unexp.sm,v
diff -p -u -r1.3 -r1.3.8.1
--- pint-sysdev-unexp.sm 30 Aug 2007 00:13:41 -0000 1.3
+++ pint-sysdev-unexp.sm 21 Jul 2008 22:02:47 -0000 1.3.8.1
@@ -98,7 +98,7 @@ PVFS_error PINT_sys_dev_unexp(
}
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
sm_p->u.sysdev_unexp.info = info;
- sm_p->cred_p = NULL;
+ sm_p->newcred_p = NULL;
ret = PINT_client_state_machine_post(smcb, op_id, user_ptr);
Index: pint-sysint-utils.c
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/pint-sysint-utils.c,v
diff -p -u -r1.35 -r1.35.30.1
--- pint-sysint-utils.c 18 Aug 2006 15:46:33 -0000 1.35
+++ pint-sysint-utils.c 21 Jul 2008 22:02:47 -0000 1.35.30.1
@@ -18,6 +18,7 @@
#include "str-utils.h"
#include "pvfs2-util.h"
#include "client-state-machine.h"
+#include "security-types.h"
/*
analogous to 'get_server_config_struct' in pvfs2-server.c -- only an
@@ -45,7 +46,7 @@ void PINT_put_server_config_struct(struc
int PINT_lookup_parent(
char *filename,
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
PVFS_handle * handle)
{
int ret = -PVFS_EINVAL;
@@ -65,7 +66,7 @@ int PINT_lookup_parent(
return ret;
}
- ret = PVFS_sys_lookup(fs_id, buf, credentials,
+ ret = PVFS_sys_lookup(fs_id, buf, credential,
&resp_look, PVFS2_LOOKUP_LINK_FOLLOW);
if (ret < 0)
{
Index: pint-sysint-utils.h
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/pint-sysint-utils.h,v
diff -p -u -r1.28 -r1.28.20.1
--- pint-sysint-utils.h 12 Sep 2006 00:49:30 -0000 1.28
+++ pint-sysint-utils.h 21 Jul 2008 22:02:47 -0000 1.28.20.1
@@ -24,6 +24,7 @@
#include "gen-locks.h"
#include "pint-cached-config.h"
#include "pvfs2-sysint.h"
+#include "security-types.h"
#include "trove.h"
#include "server-config.h"
@@ -39,7 +40,7 @@ void PINT_put_server_config_struct(
int PINT_lookup_parent(
char *filename,
PVFS_fs_id fs_id,
- PVFS_credentials *credentials,
+ PVFS_credential *credential,
PVFS_handle * handle);
/*
Index: remove.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/remove.sm,v
diff -p -u -r1.27.8.1 -r1.27.8.2
--- remove.sm 16 May 2008 15:15:31 -0000 1.27.8.1
+++ remove.sm 21 Jul 2008 22:02:47 -0000 1.27.8.2
@@ -16,6 +16,7 @@
#include "PINT-reqproto-encode.h"
#include "pint-util.h"
#include "pvfs2-internal.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -173,6 +174,9 @@ static PINT_sm_action remove_datafile_re
int i = 0;
int ret = -PVFS_EINVAL;
PVFS_object_attr *attr = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
/* post all datafile remove requests and responses simultaneously.
*
@@ -206,7 +210,7 @@ static PINT_sm_action remove_datafile_re
PINT_SERVREQ_REMOVE_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
attr->u.meta.dfile_array[i]);
@@ -234,6 +238,9 @@ static PINT_sm_action remove_object_remo
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG,
"remove state: object_remove_setup_msgpair\n");
@@ -245,7 +252,7 @@ static PINT_sm_action remove_object_remo
PINT_SERVREQ_REMOVE_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->object_ref.handle);
Index: server-get-config.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/server-get-config.sm,v
diff -p -u -r1.31.2.3 -r1.31.2.4
--- server-get-config.sm 22 May 2008 18:24:02 -0000 1.31.2.3
+++ server-get-config.sm 21 Jul 2008 22:02:48 -0000 1.31.2.4
@@ -16,6 +16,7 @@
#include "str-utils.h"
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -130,7 +131,7 @@ int PINT_server_get_config(
PINT_smcb *smcb = NULL;
PINT_client_sm *sm_p = NULL;
PVFS_error error = 0;
- PVFS_credentials creds;
+ PVFS_credential *cred;
PVFS_sys_op_id op_id;
gossip_debug(GOSSIP_CLIENT_DEBUG,
@@ -141,7 +142,9 @@ int PINT_server_get_config(
return ret;
}
- PVFS_util_gen_credentials(&creds);
+ /* TODO: pass credential in arguments */
+ cred = PVFS_util_gen_fake_credential();
+ assert(cred);
gossip_debug(GOSSIP_CLIENT_DEBUG, "asked for fs name = %s\n",
mntent_p->pvfs_fs_name);
@@ -167,7 +170,7 @@ int PINT_server_get_config(
sm_p->msgarray_op.params.retry_limit = 5; /* retry up to 5 times */
PINT_msgpair_init(&sm_p->msgarray_op);
- PINT_init_sysint_credentials(sm_p->cred_p, &creds);
+ PINT_init_sysint_credential(sm_p->newcred_p, cred);
sm_p->u.get_config.mntent = mntent_p;
sm_p->u.get_config.config = config;
@@ -254,6 +257,9 @@ static PINT_sm_action server_get_config_
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
PVFS_BMI_addr_t serv_addr;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG,
"get_config state: server_get_config_setup_msgpair\n");
@@ -276,7 +282,7 @@ static PINT_sm_action server_get_config_
return SM_ACTION_COMPLETE;
}
- PINT_SERVREQ_GETCONFIG_FILL(msg_p->req, *sm_p->cred_p);
+ PINT_SERVREQ_GETCONFIG_FILL(msg_p->req, xxremovemexx);
msg_p->fs_id = PVFS_FS_ID_NULL;
msg_p->handle = PVFS_HANDLE_NULL;
@@ -423,7 +429,7 @@ static int PINT_fetch_config_list(int ns
PINT_smcb *smcb = NULL;
PINT_client_sm *sm_p = NULL;
PVFS_error error = 0;
- PVFS_credentials creds;
+ PVFS_credential *cred;
PVFS_sys_op_id op_id;
gossip_debug(GOSSIP_CLIENT_DEBUG,
@@ -433,7 +439,10 @@ static int PINT_fetch_config_list(int ns
return ret;
}
- PVFS_util_gen_credentials(&creds);
+ /* TODO: pass credential in arguments */
+ cred = PVFS_util_gen_fake_credential();
+ assert(cred);
+
PINT_smcb_alloc(&smcb, PVFS_SERVER_FETCH_CONFIG,
sizeof(struct PINT_client_sm),
client_op_state_get_machine,
@@ -453,7 +462,7 @@ static int PINT_fetch_config_list(int ns
sm_p->msgarray_op.params.job_timeout = 30; /* 30 second job timeout */
sm_p->msgarray_op.params.retry_delay = 2000; /* 2 second retry delay */
sm_p->msgarray_op.params.retry_limit = 5; /* retry up to 5 times */
- PINT_init_sysint_credentials(sm_p->cred_p, &creds);
+ PINT_init_sysint_credential(sm_p->newcred_p, cred);
sm_p->fetch_config.nservers = nservers;
sm_p->fetch_config.addr_array = servers;
sm_p->fetch_config.fs_config_bufs = fs_config_bufs;
@@ -493,6 +502,9 @@ static PINT_sm_action server_fetch_confi
int i;
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG,
"fetch_config state: server_fetch_config_setup_msgpair\n");
@@ -500,7 +512,7 @@ static PINT_sm_action server_fetch_confi
foreach_msgpair(&sm_p->msgarray_op, msg_p, i)
{
sm_p->msgarray_op.msgarray[i].enc_type = sm_p->msgarray_op.msgpair.enc_type;
- PINT_SERVREQ_GETCONFIG_FILL(msg_p->req, *sm_p->cred_p);
+ PINT_SERVREQ_GETCONFIG_FILL(msg_p->req, xxremovemexx);
msg_p->fs_id = PVFS_FS_ID_NULL;
msg_p->handle = PVFS_HANDLE_NULL;
Index: sys-create.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-create.sm,v
diff -p -u -r1.115.2.2 -r1.115.2.3
--- sys-create.sm 20 Jun 2008 19:13:24 -0000 1.115.2.2
+++ sys-create.sm 21 Jul 2008 22:02:48 -0000 1.115.2.3
@@ -1,5 +1,5 @@
/*
- * Copyright © Acxiom Corporation, 2006
+ * Copyright Acxiom Corporation, 2006
*
* See COPYING in top-level directory.
*/
@@ -26,6 +26,7 @@
#include "pint-dist-utils.h"
#include "ncache.h"
#include "pvfs2-internal.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -176,7 +177,7 @@ PVFS_error PVFS_isys_create(
char *object_name,
PVFS_object_ref parent_ref,
PVFS_sys_attr attr,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sys_dist *dist,
PVFS_sys_layout *layout,
PVFS_sysresp_create *resp,
@@ -232,7 +233,7 @@ PVFS_error PVFS_isys_create(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, parent_ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.create.object_name = object_name;
sm_p->u.create.create_resp = resp;
sm_p->u.create.datafile_handles = NULL;
@@ -344,7 +345,7 @@ PVFS_error PVFS_sys_create(
char *object_name,
PVFS_object_ref parent_ref,
PVFS_sys_attr attr,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sys_dist *dist,
PVFS_sys_layout *layout,
PVFS_sysresp_create *resp)
@@ -354,7 +355,7 @@ PVFS_error PVFS_sys_create(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_create entered\n");
- ret = PVFS_isys_create(object_name, parent_ref, attr, credentials,
+ ret = PVFS_isys_create(object_name, parent_ref, attr, credential,
dist, layout, resp, &op_id, NULL);
if (ret)
{
@@ -539,6 +540,9 @@ static PINT_sm_action create_dspace_crea
PVFS_handle_extent_array meta_handle_extent_array;
PINT_sm_msgpair_state *msg_p = NULL;
int server_type;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG, "create state: "
"dspace_create_setup_msgpair\n");
@@ -583,7 +587,8 @@ static PINT_sm_action create_dspace_crea
PINT_SERVREQ_CREATE_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
+ *sm_p->newcred_p,
sm_p->object_ref.fs_id,
PVFS_TYPE_METAFILE,
meta_handle_extent_array);
@@ -604,6 +609,9 @@ static PINT_sm_action create_datafiles_s
int ret = -PVFS_EINVAL, i = 0;
PINT_sm_msgpair_state *msg_p;
int server_type;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG, "create state: "
"datafiles_setup_msgpair_array\n");
@@ -677,7 +685,8 @@ static PINT_sm_action create_datafiles_s
PINT_SERVREQ_CREATE_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
+ *sm_p->newcred_p,
sm_p->object_ref.fs_id,
PVFS_TYPE_DATAFILE,
sm_p->u.create.io_handle_extent_array[i]);
@@ -718,6 +727,9 @@ static PINT_sm_action create_setattr_set
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG,
"create state: setattr_setup_msgpair\n");
@@ -731,7 +743,7 @@ static PINT_sm_action create_setattr_set
PINT_SERVREQ_SETATTR_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->u.create.metafile_handle,
PVFS_TYPE_METAFILE,
@@ -782,6 +794,9 @@ static PINT_sm_action create_crdirent_se
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -1;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG,
"create state: crdirent_setup_msgpair\n");
@@ -800,7 +815,7 @@ static PINT_sm_action create_crdirent_se
PINT_SERVREQ_CRDIRENT_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->u.create.object_name,
sm_p->u.create.metafile_handle,
sm_p->object_ref.handle,
@@ -849,6 +864,9 @@ static PINT_sm_action create_delete_hand
int ret = -PVFS_EINVAL, i = 0, actual_count = 0;
PVFS_BMI_addr_t metafile_server_addr;
PINT_sm_msgpair_state *msg_p;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG, "create state: "
"delete_handles_setup_msgpair_array\n");
@@ -910,7 +928,7 @@ static PINT_sm_action create_delete_hand
{
PINT_SERVREQ_REMOVE_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->u.create.metafile_handle);
@@ -927,7 +945,7 @@ static PINT_sm_action create_delete_hand
{
PINT_SERVREQ_REMOVE_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->u.create.datafile_handles[i]);
Index: sys-del-eattr.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-del-eattr.sm,v
diff -p -u -r1.10.8.1 -r1.10.8.2
--- sys-del-eattr.sm 16 May 2008 15:15:31 -0000 1.10.8.1
+++ sys-del-eattr.sm 21 Jul 2008 22:02:48 -0000 1.10.8.2
@@ -16,6 +16,7 @@
#include "str-utils.h"
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -52,7 +53,7 @@ machine pvfs2_client_del_eattr_sm
PVFS_error PVFS_isys_deleattr(
PVFS_object_ref ref,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_ds_keyval *key_p,
PVFS_sys_op_id *op_id,
void *user_ptr)
@@ -82,7 +83,7 @@ PVFS_error PVFS_isys_deleattr(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.deleattr.key_p = key_p;
sm_p->error_code = 0;
sm_p->object_ref = ref;
@@ -93,7 +94,7 @@ PVFS_error PVFS_isys_deleattr(
PVFS_error PVFS_sys_deleattr(
PVFS_object_ref ref,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_ds_keyval *key_p)
{
PVFS_error ret = -PVFS_EINVAL, error = 0;
@@ -101,7 +102,7 @@ PVFS_error PVFS_sys_deleattr(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_deleattr entered\n");
- ret = PVFS_isys_deleattr(ref, credentials,
+ ret = PVFS_isys_deleattr(ref, credential,
key_p, &op_id, NULL);
if (ret)
@@ -129,6 +130,9 @@ static PINT_sm_action del_eattr_setup_ms
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG,
"del_eattr state: del_eattr_setup_msgpair\n");
@@ -138,7 +142,7 @@ static PINT_sm_action del_eattr_setup_ms
PINT_SERVREQ_DELEATTR_FILL(
msg_p->req,
- (*sm_p->cred_p),
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->object_ref.handle,
(*sm_p->u.deleattr.key_p));
Index: sys-flush.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-flush.sm,v
diff -p -u -r1.41.8.1 -r1.41.8.2
--- sys-flush.sm 16 May 2008 15:15:31 -0000 1.41.8.1
+++ sys-flush.sm 21 Jul 2008 22:02:48 -0000 1.41.8.2
@@ -22,6 +22,7 @@
#include "PINT-reqproto-encode.h"
#include "pint-util.h"
#include "pvfs2-internal.h"
+#include "security-util.h"
extern job_context_id pint_client_sm_context;
@@ -69,7 +70,7 @@ machine pvfs2_client_flush_sm
*/
PVFS_error PVFS_isys_flush(
PVFS_object_ref ref,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sys_op_id *op_id,
void *user_ptr)
{
@@ -98,7 +99,7 @@ PVFS_error PVFS_isys_flush(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->object_ref = ref;
/* NOTE: This state machine previously multiplied the default job timeout
@@ -122,14 +123,14 @@ PVFS_error PVFS_isys_flush(
*/
PVFS_error PVFS_sys_flush(
PVFS_object_ref ref,
- const PVFS_credentials *credentials)
+ const PVFS_credential *credential)
{
PVFS_error ret = -PVFS_EINVAL, error = 0;
PVFS_sys_op_id op_id;
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_flush entered\n");
- ret = PVFS_isys_flush(ref, credentials, &op_id, NULL);
+ ret = PVFS_isys_flush(ref, credential, &op_id, NULL);
if (ret)
{
PVFS_perror_gossip("PVFS_isys_flush call", ret);
@@ -156,6 +157,9 @@ static int flush_datafile_setup_msgpaira
int ret = -PVFS_EINVAL, i = 0;
PVFS_object_attr *attr = NULL;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG, "(%p) flush state: "
"datafile_setup_msgpairarray\n", sm_p);
@@ -186,7 +190,7 @@ static int flush_datafile_setup_msgpaira
llu(attr->u.meta.dfile_array[i]));
PINT_SERVREQ_FLUSH_FILL(msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
attr->u.meta.dfile_array[i]);
@@ -204,7 +208,7 @@ static int flush_datafile_setup_msgpaira
llu(sm_p->object_ref.handle));
PINT_SERVREQ_FLUSH_FILL(msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->object_ref.handle);
Index: sys-get-eattr.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-get-eattr.sm,v
diff -p -u -r1.12.8.1 -r1.12.8.2
--- sys-get-eattr.sm 16 May 2008 15:15:31 -0000 1.12.8.1
+++ sys-get-eattr.sm 21 Jul 2008 22:02:48 -0000 1.12.8.2
@@ -17,6 +17,7 @@
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
#include "pint-eattr.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -53,7 +54,7 @@ machine pvfs2_client_get_eattr_sm
PVFS_error PVFS_isys_geteattr_list(
PVFS_object_ref ref,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
int32_t nkey,
PVFS_ds_keyval *key_array,
PVFS_sysresp_geteattr *resp_p,
@@ -86,7 +87,7 @@ PVFS_error PVFS_isys_geteattr_list(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.geteattr.nkey = nkey;
sm_p->u.geteattr.key_array = key_array;
sm_p->u.geteattr.resp_p = resp_p;
@@ -99,7 +100,7 @@ PVFS_error PVFS_isys_geteattr_list(
PVFS_error PVFS_sys_geteattr_list(
PVFS_object_ref ref,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
int32_t nkey,
PVFS_ds_keyval *key_array,
PVFS_sysresp_geteattr *resp_p)
@@ -109,7 +110,7 @@ PVFS_error PVFS_sys_geteattr_list(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_geteattr entered\n");
- ret = PVFS_isys_geteattr_list(ref, credentials,
+ ret = PVFS_isys_geteattr_list(ref, credential,
nkey, key_array, resp_p, &op_id, NULL);
if (ret)
@@ -133,7 +134,7 @@ PVFS_error PVFS_sys_geteattr_list(
PVFS_error PVFS_sys_geteattr(
PVFS_object_ref ref,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_ds_keyval *key_p,
PVFS_ds_keyval *val_p)
{
@@ -141,7 +142,7 @@ PVFS_error PVFS_sys_geteattr(
PVFS_error tmp_err;
resp_p.val_array = val_p;
resp_p.err_array = &tmp_err;
- return PVFS_sys_geteattr_list(ref, credentials, 1, key_p, &resp_p);
+ return PVFS_sys_geteattr_list(ref, credential, 1, key_p, &resp_p);
}
static PINT_sm_action get_eattr_setup_msgpair(
@@ -151,6 +152,9 @@ static PINT_sm_action get_eattr_setup_ms
int ret = -PVFS_EINVAL;
int i;
PINT_sm_msgpair_state *msg_p;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG,
"get_eattr state: get_eattr_setup_msgpair\n");
@@ -171,7 +175,7 @@ static PINT_sm_action get_eattr_setup_ms
PINT_SERVREQ_GETEATTR_FILL(
msg_p->req,
- (*sm_p->cred_p),
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->object_ref.handle,
sm_p->u.geteattr.nkey,
Index: sys-io.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-io.sm,v
diff -p -u -r1.159.4.1 -r1.159.4.2
--- sys-io.sm 16 May 2008 15:15:31 -0000 1.159.4.1
+++ sys-io.sm 21 Jul 2008 22:02:48 -0000 1.159.4.2
@@ -22,6 +22,7 @@
#include "PINT-reqproto-encode.h"
#include "pint-util.h"
#include "pvfs2-internal.h"
+#include "security-types.h"
#define IO_MAX_SEGMENT_NUM 50
@@ -225,7 +226,7 @@ PVFS_error PVFS_isys_io(
PVFS_offset file_req_offset,
void *buffer,
PVFS_Request mem_req,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sysresp_io *resp_p,
enum PVFS_io_type io_type,
PVFS_sys_op_id *op_id,
@@ -285,7 +286,7 @@ PVFS_error PVFS_isys_io(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.io.io_type = io_type;
sm_p->u.io.file_req = file_req;
sm_p->u.io.file_req_offset = file_req_offset;
@@ -318,7 +319,7 @@ PVFS_error PVFS_sys_io(
PVFS_offset file_req_offset,
void *buffer,
PVFS_Request mem_req,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sysresp_io *resp_p,
enum PVFS_io_type io_type)
{
@@ -328,7 +329,7 @@ PVFS_error PVFS_sys_io(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_io entered\n");
ret = PVFS_isys_io(ref, file_req, file_req_offset, buffer, mem_req,
- credentials, resp_p, io_type, &op_id, NULL);
+ credential, resp_p, io_type, &op_id, NULL);
if (ret == 1)
return 0;
else if (ret < 0)
@@ -407,6 +408,9 @@ static PINT_sm_action io_datafile_setup_
int target_datafile_count = 0;
int * sio_array;
int sio_count;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG, "(%p) io state: "
"io_datafile_setup_msgpairs\n", sm_p);
@@ -544,7 +548,7 @@ static PINT_sm_action io_datafile_setup_
PINT_SERVREQ_IO_FILL(
sm_p->u.io.contexts[i].msg.req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->u.io.contexts[i].data_handle,
sm_p->u.io.io_type,
Index: sys-list-eattr.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-list-eattr.sm,v
diff -p -u -r1.9.8.1 -r1.9.8.2
--- sys-list-eattr.sm 16 May 2008 15:15:31 -0000 1.9.8.1
+++ sys-list-eattr.sm 21 Jul 2008 22:02:48 -0000 1.9.8.2
@@ -16,6 +16,7 @@
#include "str-utils.h"
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -54,7 +55,7 @@ PVFS_error PVFS_isys_listeattr(
PVFS_object_ref ref,
PVFS_ds_position token,
int32_t nkey,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sysresp_listeattr *resp_p,
PVFS_sys_op_id *op_id,
void *user_ptr)
@@ -85,7 +86,7 @@ PVFS_error PVFS_isys_listeattr(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.listeattr.nkey = nkey;
sm_p->u.listeattr.resp_p = resp_p;
sm_p->u.listeattr.pos_token = token;
@@ -100,7 +101,7 @@ PVFS_error PVFS_sys_listeattr(
PVFS_object_ref ref,
PVFS_ds_position token,
int32_t nkey,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sysresp_listeattr *resp_p)
{
PVFS_error ret = -PVFS_EINVAL, error = 0;
@@ -108,7 +109,7 @@ PVFS_error PVFS_sys_listeattr(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_listeattr entered\n");
- ret = PVFS_isys_listeattr(ref, token, nkey, credentials,
+ ret = PVFS_isys_listeattr(ref, token, nkey, credential,
resp_p, &op_id, NULL);
if (ret)
@@ -137,6 +138,9 @@ static PINT_sm_action list_eattr_setup_m
int ret = -PVFS_EINVAL;
int i;
PINT_sm_msgpair_state *msg_p;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG,
"list_eattr state: list_eattr_setup_msgpair\n");
@@ -155,7 +159,7 @@ static PINT_sm_action list_eattr_setup_m
PINT_SERVREQ_LISTEATTR_FILL(
msg_p->req,
- (*sm_p->cred_p),
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->object_ref.handle,
sm_p->u.listeattr.pos_token,
Index: sys-lookup.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-lookup.sm,v
diff -p -u -r1.75.4.1 -r1.75.4.2
--- sys-lookup.sm 16 May 2008 15:15:31 -0000 1.75.4.1
+++ sys-lookup.sm 21 Jul 2008 22:02:48 -0000 1.75.4.2
@@ -23,6 +23,7 @@
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
#include "pvfs2-internal.h"
+#include "security-util.h"
extern job_context_id pint_client_sm_context;
@@ -451,7 +452,7 @@ PVFS_error PVFS_isys_ref_lookup(
PVFS_fs_id fs_id,
char* relative_pathname,
PVFS_object_ref parent,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sysresp_lookup *resp,
int32_t follow_link,
PVFS_sys_op_id *op_id,
@@ -480,7 +481,7 @@ PVFS_error PVFS_isys_ref_lookup(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.lookup.orig_pathname = relative_pathname;
sm_p->u.lookup.starting_refn = parent;
sm_p->u.lookup.lookup_resp = resp;
@@ -495,7 +496,7 @@ PVFS_error PVFS_isys_ref_lookup(
gossip_err("%s: failed to init context (path = %s)\n",
__func__, relative_pathname);
- PVFS_util_release_credentials(sm_p->cred_p);
+ PINT_release_credential(sm_p->newcred_p);
PINT_smcb_free(smcb);
return ret;
}
@@ -513,7 +514,7 @@ PVFS_error PVFS_sys_ref_lookup(
PVFS_fs_id fs_id,
char *relative_pathname,
PVFS_object_ref parent,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sysresp_lookup *resp,
int32_t follow_link)
{
@@ -523,7 +524,7 @@ PVFS_error PVFS_sys_ref_lookup(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_ref_lookup entered\n");
ret = PVFS_isys_ref_lookup(
- fs_id, relative_pathname, parent, credentials, resp,
+ fs_id, relative_pathname, parent, credential, resp,
follow_link, &op_id, resp);
if (ret)
@@ -554,7 +555,7 @@ PVFS_error PVFS_sys_ref_lookup(
*/
PVFS_error PVFS_sys_lookup(
PVFS_fs_id fs_id, char *name,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sysresp_lookup *resp,
int32_t follow_link)
{
@@ -591,7 +592,7 @@ PVFS_error PVFS_sys_lookup(
*/
char *path = ((name[0] == '/') ? &name[1] : name);
ret = PVFS_sys_ref_lookup(
- fs_id, path, parent, credentials, resp, follow_link);
+ fs_id, path, parent, credential, resp, follow_link);
}
}
return ret;
@@ -660,6 +661,9 @@ static PINT_sm_action lookup_segment_set
PINT_sm_msgpair_state *msg_p = NULL;
PINT_client_lookup_sm_segment *cur_seg = NULL;
char *seg_to_lookup = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG, "%s\n", __func__);
js_p->error_code = 0;
@@ -688,7 +692,7 @@ static PINT_sm_action lookup_segment_set
PINT_SERVREQ_LOOKUP_PATH_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
seg_to_lookup,
cur_seg->seg_starting_refn.fs_id,
cur_seg->seg_starting_refn.handle,
Index: sys-mkdir.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-mkdir.sm,v
diff -p -u -r1.63.2.1 -r1.63.2.2
--- sys-mkdir.sm 16 May 2008 15:15:31 -0000 1.63.2.1
+++ sys-mkdir.sm 21 Jul 2008 22:02:48 -0000 1.63.2.2
@@ -26,6 +26,7 @@
#include "pint-util.h"
#include "ncache.h"
#include "pvfs2-internal.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -156,7 +157,7 @@ PVFS_error PVFS_isys_mkdir(
char *object_name,
PVFS_object_ref parent_ref,
PVFS_sys_attr attr,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sysresp_mkdir *resp,
PVFS_sys_op_id *op_id,
void *user_ptr)
@@ -200,7 +201,7 @@ PVFS_error PVFS_isys_mkdir(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, parent_ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.mkdir.object_name = object_name;
PVFS_util_copy_sys_attr(&sm_p->u.mkdir.sys_attr, &attr);
sm_p->u.mkdir.mkdir_resp = resp;
@@ -221,7 +222,7 @@ PVFS_error PVFS_sys_mkdir(
char *object_name,
PVFS_object_ref parent_ref,
PVFS_sys_attr attr,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sysresp_mkdir *resp)
{
PVFS_error ret = -PVFS_EINVAL, error = 0;
@@ -230,7 +231,7 @@ PVFS_error PVFS_sys_mkdir(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_mkdir entered\n");
ret = PVFS_isys_mkdir(object_name, parent_ref, attr,
- credentials, resp, &op_id, NULL);
+ credential, resp, &op_id, NULL);
if (ret)
{
PVFS_perror_gossip("PVFS_isys_mkdir call", ret);
@@ -340,6 +341,9 @@ static PINT_sm_action mkdir_msg_setup_ms
int ret = -PVFS_EINVAL;
PVFS_handle_extent_array meta_handle_extent_array;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG,
"mkdir state: mkdir_msg_setup_msgpair\n");
@@ -364,7 +368,8 @@ static PINT_sm_action mkdir_msg_setup_ms
PINT_SERVREQ_MKDIR_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
+ *sm_p->newcred_p,
sm_p->object_ref.fs_id,
meta_handle_extent_array,
sm_p->u.mkdir.sys_attr);
@@ -394,7 +399,10 @@ static PINT_sm_action mkdir_crdirent_set
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
+
gossip_debug(GOSSIP_CLIENT_DEBUG,
"mkdir state: crdirent_setup_msgpair\n");
@@ -412,7 +420,7 @@ static PINT_sm_action mkdir_crdirent_set
PINT_SERVREQ_CRDIRENT_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->u.mkdir.object_name,
sm_p->u.mkdir.metafile_handle,
sm_p->object_ref.handle,
@@ -456,6 +464,9 @@ static PINT_sm_action mkdir_delete_handl
int ret = -PVFS_EINVAL;
PVFS_BMI_addr_t metafile_server_addr;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG, "mkdir state: "
"delete_handle_setup_msgpair_array\n");
@@ -478,7 +489,7 @@ static PINT_sm_action mkdir_delete_handl
PINT_SERVREQ_REMOVE_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->u.mkdir.metafile_handle);
@@ -598,6 +609,9 @@ static PINT_sm_action mkdir_seteattr_set
int cur_index = 0;
PINT_sm_msgpair_state *msg_p = NULL;
int ret = -PVFS_EINVAL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
/* NOTE: any memory allocated here will be free'd in the cleanup function */
@@ -695,7 +709,7 @@ static PINT_sm_action mkdir_seteattr_set
PINT_SERVREQ_SETEATTR_FILL(
msg_p->req,
- (*sm_p->cred_p),
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->u.mkdir.metafile_handle,
0,
Index: sys-readdir.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-readdir.sm,v
diff -p -u -r1.52.8.1 -r1.52.8.2
--- sys-readdir.sm 16 May 2008 15:15:31 -0000 1.52.8.1
+++ sys-readdir.sm 21 Jul 2008 22:02:48 -0000 1.52.8.2
@@ -22,6 +22,7 @@
#include "ncache.h"
#include "pint-util.h"
#include "pvfs2-internal.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -99,7 +100,7 @@ PVFS_error PVFS_isys_readdir(
PVFS_object_ref ref,
PVFS_ds_position token,
int32_t pvfs_dirent_incount,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sysresp_readdir *resp,
PVFS_sys_op_id *op_id,
void *user_ptr)
@@ -137,7 +138,7 @@ PVFS_error PVFS_isys_readdir(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.readdir.readdir_resp = resp;
sm_p->object_ref = ref;
/* point the sm dirent array and outcount to the readdir response field */
@@ -167,7 +168,7 @@ PVFS_error PVFS_sys_readdir(
PVFS_object_ref ref,
PVFS_ds_position token,
int32_t pvfs_dirent_incount,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sysresp_readdir *resp)
{
PVFS_error ret = -PVFS_EINVAL, error = 0;
@@ -176,7 +177,7 @@ PVFS_error PVFS_sys_readdir(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_readdir entered\n");
ret = PVFS_isys_readdir(ref, token, pvfs_dirent_incount,
- credentials, resp, &op_id, NULL);
+ credential, resp, &op_id, NULL);
if (ret)
{
PVFS_perror_gossip("PVFS_isys_readdir call", ret);
@@ -222,6 +223,9 @@ static PINT_sm_action readdir_msg_setup_
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG, "readdir state: "
"readdir_msg_setup_msgpair\n");
@@ -246,7 +250,7 @@ static PINT_sm_action readdir_msg_setup_
PINT_SERVREQ_READDIR_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->object_ref.handle,
sm_p->readdir.pos_token,
Index: sys-readdirplus.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-readdirplus.sm,v
diff -p -u -r1.9.2.1 -r1.9.2.2
--- sys-readdirplus.sm 16 May 2008 15:15:31 -0000 1.9.2.1
+++ sys-readdirplus.sm 21 Jul 2008 22:02:48 -0000 1.9.2.2
@@ -28,6 +28,7 @@
#include "ncache.h"
#include "pint-util.h"
#include "pvfs2-internal.h"
+#include "security-types.h"
enum {
NO_WORK = 1
@@ -110,7 +111,7 @@ PVFS_error PVFS_isys_readdirplus(
PVFS_object_ref ref,
PVFS_ds_position token,
int32_t pvfs_dirent_incount,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
uint32_t attrmask,
PVFS_sysresp_readdirplus *resp,
PVFS_sys_op_id *op_id,
@@ -149,7 +150,7 @@ PVFS_error PVFS_isys_readdirplus(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->object_ref = ref;
/* point the sm dirent array and outcount to the readdirplus response field */
sm_p->readdir.dirent_array = &resp->dirent_array;
@@ -189,7 +190,7 @@ PVFS_error PVFS_sys_readdirplus(
PVFS_object_ref ref,
PVFS_ds_position token,
int32_t pvfs_dirent_incount,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
uint32_t attrmask,
PVFS_sysresp_readdirplus *resp)
{
@@ -199,7 +200,7 @@ PVFS_error PVFS_sys_readdirplus(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_readdirplus entered\n");
ret = PVFS_isys_readdirplus(ref, token, pvfs_dirent_incount,
- credentials, attrmask, resp, &op_id, NULL);
+ credential, attrmask, resp, &op_id, NULL);
if (ret)
{
PVFS_perror_gossip("PVFS_isys_readdirplus call", ret);
@@ -467,6 +468,9 @@ static PINT_sm_action readdirplus_fetch_
int i, ret;
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG, "readdirplus state: fetch_attrs_setup\n");
/* if there are no dirents then return NO_WORK */
@@ -506,7 +510,7 @@ static PINT_sm_action readdirplus_fetch_
{
PINT_SERVREQ_LISTATTR_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->u.readdirplus.attrmask,
sm_p->u.readdirplus.handle_count[i],
@@ -688,6 +692,9 @@ static PINT_sm_action readdirplus_fetch_
int i, ret;
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_sm_msgpair_state *msg_p;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
PINT_msgpairarray_destroy(&sm_p->msgarray_op);
@@ -724,7 +731,7 @@ static PINT_sm_action readdirplus_fetch_
{
PINT_SERVREQ_LISTATTR_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
PVFS_ATTR_DATA_SIZE,
sm_p->u.readdirplus.handle_count[i],
Index: sys-remove.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-remove.sm,v
diff -p -u -r1.105.8.1 -r1.105.8.2
--- sys-remove.sm 16 May 2008 15:15:31 -0000 1.105.8.1
+++ sys-remove.sm 21 Jul 2008 22:02:48 -0000 1.105.8.2
@@ -23,6 +23,7 @@
#include "PINT-reqproto-encode.h"
#include "ncache.h"
#include "pvfs2-internal.h"
+#include "security-types.h"
/*
PVFS_{i}sys_remove takes the following steps:
@@ -152,7 +153,7 @@ machine pvfs2_client_remove_sm
PVFS_error PVFS_isys_remove(
char *object_name,
PVFS_object_ref parent_ref,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sys_op_id *op_id,
void *user_ptr)
{
@@ -182,7 +183,7 @@ PVFS_error PVFS_isys_remove(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, parent_ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.remove.object_name = object_name;
sm_p->parent_ref = parent_ref;
sm_p->u.remove.stored_error_code = 0;
@@ -206,7 +207,7 @@ PVFS_error PVFS_isys_remove(
PVFS_error PVFS_sys_remove(
char *object_name,
PVFS_object_ref parent_ref,
- const PVFS_credentials *credentials)
+ const PVFS_credential *credential)
{
PVFS_error ret = -PVFS_EINVAL, error = 0;
PVFS_sys_op_id op_id;
@@ -214,7 +215,7 @@ PVFS_error PVFS_sys_remove(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_remove entered\n");
ret = PVFS_isys_remove(object_name, parent_ref,
- credentials, &op_id, NULL);
+ credential, &op_id, NULL);
if (ret)
{
PVFS_perror_gossip("PVFS_isys_remove call", ret);
@@ -252,6 +253,9 @@ static PINT_sm_action remove_rmdirent_se
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
/* NOTE: we remove the dirent first because this gets the object
* out of the system fastest.
@@ -266,7 +270,7 @@ static PINT_sm_action remove_rmdirent_se
PINT_SERVREQ_RMDIRENT_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->parent_ref.fs_id,
sm_p->parent_ref.handle,
sm_p->u.remove.object_name);
@@ -300,6 +304,9 @@ static PINT_sm_action remove_crdirent_se
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
gossip_debug(GOSSIP_CLIENT_DEBUG,
"remove state: crdirent_setup_msgpair\n");
@@ -313,7 +320,7 @@ static PINT_sm_action remove_crdirent_se
PINT_SERVREQ_CRDIRENT_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->u.remove.object_name,
sm_p->object_ref.handle,
sm_p->parent_ref.handle,
Index: sys-rename.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-rename.sm,v
diff -p -u -r1.56.8.2 -r1.56.8.3
--- sys-rename.sm 20 Jun 2008 19:13:24 -0000 1.56.8.2
+++ sys-rename.sm 21 Jul 2008 22:02:48 -0000 1.56.8.3
@@ -2,7 +2,7 @@
* (C) 2003 Clemson University and The University of Chicago
*
* Changes by Acxiom Corporation to add extra safety checks via getattr
- * Copyright © Acxiom Corporation, 2005.
+ * Copyright Acxiom Corporation, 2005.
*
* See COPYING in top-level directory.
*/
@@ -27,6 +27,7 @@
#include "pint-util.h"
#include "pvfs2-internal.h"
#include "ncache.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -222,7 +223,7 @@ PVFS_error PVFS_isys_rename(
PVFS_object_ref old_parent_ref,
char *new_entry,
PVFS_object_ref new_parent_ref,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sys_op_id *op_id,
void *user_ptr)
{
@@ -267,7 +268,7 @@ PVFS_error PVFS_isys_rename(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, old_parent_ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
/*
this state machine has several hardcoded 2's around because
we're dealing with 1 'old' entry, 1 'old' handle, 1 'old' parent
@@ -312,7 +313,7 @@ PVFS_error PVFS_sys_rename(
PVFS_object_ref old_parent_ref,
char *new_entry,
PVFS_object_ref new_parent_ref,
- const PVFS_credentials *credentials)
+ const PVFS_credential *credential)
{
PVFS_error ret = -PVFS_EINVAL, error = 0;
PVFS_sys_op_id op_id;
@@ -320,7 +321,7 @@ PVFS_error PVFS_sys_rename(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_rename entered\n");
ret = PVFS_isys_rename(old_entry, old_parent_ref, new_entry,
- new_parent_ref, credentials, &op_id, NULL);
+ new_parent_ref, credential, &op_id, NULL);
if (ret)
{
PVFS_perror_gossip("PVFS_isys_rename call", ret);
@@ -518,6 +519,9 @@ static PINT_sm_action rename_lookups_set
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL, i = 0;
PINT_sm_msgpair_state *msg_p;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
js_p->error_code = 0;
@@ -539,7 +543,7 @@ static PINT_sm_action rename_lookups_set
PINT_SERVREQ_LOOKUP_PATH_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->u.rename.entries[i],
sm_p->u.rename.parent_refns[i].fs_id,
sm_p->u.rename.parent_refns[i].handle,
@@ -580,6 +584,9 @@ static PINT_sm_action rename_crdirent_se
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
js_p->error_code = 0;
@@ -596,7 +603,7 @@ static PINT_sm_action rename_crdirent_se
*/
PINT_SERVREQ_CRDIRENT_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->u.rename.entries[1],
sm_p->u.rename.refns[0].handle,
sm_p->u.rename.parent_refns[1].handle,
@@ -626,6 +633,9 @@ static PINT_sm_action rename_rmdirent_se
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
js_p->error_code = 0;
@@ -648,7 +658,7 @@ static PINT_sm_action rename_rmdirent_se
*/
PINT_SERVREQ_RMDIRENT_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->u.rename.parent_refns[sm_p->u.rename.rmdirent_index].fs_id,
sm_p->u.rename.parent_refns[sm_p->u.rename.rmdirent_index].handle,
sm_p->u.rename.entries[sm_p->u.rename.rmdirent_index]);
@@ -709,6 +719,9 @@ static PINT_sm_action rename_chdirent_se
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
PVFS_object_attr *attr = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
/* look at the result of the dest getattr and make sure everything looks
* ok before we continue
@@ -776,7 +789,7 @@ static PINT_sm_action rename_chdirent_se
*/
PINT_SERVREQ_CHDIRENT_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->u.rename.parent_refns[1].fs_id,
sm_p->u.rename.parent_refns[1].handle,
sm_p->u.rename.refns[0].handle,
Index: sys-set-eattr.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-set-eattr.sm,v
diff -p -u -r1.11.8.1 -r1.11.8.2
--- sys-set-eattr.sm 16 May 2008 15:15:31 -0000 1.11.8.1
+++ sys-set-eattr.sm 21 Jul 2008 22:02:48 -0000 1.11.8.2
@@ -16,6 +16,7 @@
#include "str-utils.h"
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -52,7 +53,7 @@ machine pvfs2_client_set_eattr_sm
PVFS_error PVFS_isys_seteattr_list(
PVFS_object_ref ref,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
int32_t nkey,
PVFS_ds_keyval *key_array,
PVFS_ds_keyval *val_array,
@@ -100,7 +101,7 @@ PVFS_error PVFS_isys_seteattr_list(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.seteattr.nkey = nkey;
sm_p->u.seteattr.key_array = key_array;
sm_p->u.seteattr.val_array = val_array;
@@ -114,7 +115,7 @@ PVFS_error PVFS_isys_seteattr_list(
PVFS_error PVFS_sys_seteattr_list(
PVFS_object_ref ref,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
int32_t nkey,
PVFS_ds_keyval *key_array,
PVFS_ds_keyval *val_array,
@@ -125,7 +126,7 @@ PVFS_error PVFS_sys_seteattr_list(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_seteattr entered\n");
- ret = PVFS_isys_seteattr_list(ref, credentials,
+ ret = PVFS_isys_seteattr_list(ref, credential,
nkey, key_array, val_array, flags, &op_id, NULL);
if (ret)
@@ -149,12 +150,12 @@ PVFS_error PVFS_sys_seteattr_list(
PVFS_error PVFS_sys_seteattr(
PVFS_object_ref ref,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_ds_keyval *key_p,
PVFS_ds_keyval *val_p,
int32_t flags)
{
- return PVFS_sys_seteattr_list(ref, credentials, 1, key_p, val_p, flags);
+ return PVFS_sys_seteattr_list(ref, credential, 1, key_p, val_p, flags);
}
@@ -164,13 +165,16 @@ static PINT_sm_action set_eattr_setup_ms
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
PINT_msgpair_init(&sm_p->msgarray_op);
msg_p = &sm_p->msgarray_op.msgpair;
PINT_SERVREQ_SETEATTR_FILL(
msg_p->req,
- (*sm_p->cred_p),
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->object_ref.handle,
sm_p->u.seteattr.flags,
Index: sys-setattr.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-setattr.sm,v
diff -p -u -r1.51.8.1 -r1.51.8.2
--- sys-setattr.sm 16 May 2008 15:15:31 -0000 1.51.8.1
+++ sys-setattr.sm 21 Jul 2008 22:02:48 -0000 1.51.8.2
@@ -23,6 +23,7 @@
#include "PINT-reqproto-encode.h"
#include "pint-util.h"
#include "pvfs2-internal.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -73,7 +74,7 @@ machine pvfs2_client_setattr_sm
PVFS_error PVFS_isys_setattr(
PVFS_object_ref ref,
PVFS_sys_attr attr,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sys_op_id *op_id,
void *user_ptr)
{
@@ -121,7 +122,7 @@ PVFS_error PVFS_isys_setattr(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->object_ref = ref;
ret = PVFS_util_copy_sys_attr(&sm_p->u.setattr.sys_attr, &attr);
@@ -145,14 +146,14 @@ PVFS_error PVFS_isys_setattr(
PVFS_error PVFS_sys_setattr(
PVFS_object_ref ref,
PVFS_sys_attr attr,
- const PVFS_credentials *credentials)
+ const PVFS_credential *credential)
{
PVFS_error ret = -PVFS_EINVAL, error = 0;
PVFS_sys_op_id op_id;
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_setattr entered\n");
- ret = PVFS_isys_setattr(ref, attr, credentials, &op_id, NULL);
+ ret = PVFS_isys_setattr(ref, attr, credential, &op_id, NULL);
if (ret)
{
PVFS_perror_gossip("PVFS_isys_setattr call", ret);
@@ -198,6 +199,9 @@ static PINT_sm_action setattr_msg_setup_
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
PVFS_ds_type objtype;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
js_p->error_code = 0;
@@ -211,7 +215,7 @@ static PINT_sm_action setattr_msg_setup_
PINT_SERVREQ_SETATTR_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->object_ref.handle,
objtype,
Index: sys-small-io.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-small-io.sm,v
diff -p -u -r1.15.8.1 -r1.15.8.2
--- sys-small-io.sm 16 May 2008 15:15:32 -0000 1.15.8.1
+++ sys-small-io.sm 21 Jul 2008 22:02:48 -0000 1.15.8.2
@@ -77,6 +77,9 @@ static PINT_sm_action small_io_setup_msg
PVFS_handle datafile_handle;
int regions = 0;
PINT_sm_msgpair_state *msg_p;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
js_p->error_code = 0;
@@ -158,7 +161,7 @@ static PINT_sm_action small_io_setup_msg
*/
PINT_SERVREQ_SMALL_IO_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
datafile_handle,
sm_p->u.io.io_type,
Index: sys-statfs.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-statfs.sm,v
diff -p -u -r1.8.2.1 -r1.8.2.2
--- sys-statfs.sm 16 May 2008 15:15:32 -0000 1.8.2.1
+++ sys-statfs.sm 21 Jul 2008 22:02:48 -0000 1.8.2.2
@@ -2,7 +2,7 @@
* (C) 2003 Clemson University and The University of Chicago
*
* Changes by Acxiom Corporation to add support for nonblocking statfs
- * Copyright © Acxiom Corporation, 2006.
+ * Copyright Acxiom Corporation, 2006.
*
* See COPYING in top-level directory.
*/
@@ -24,6 +24,7 @@
#include "pvfs2-mgmt.h"
#include "pint-cached-config.h"
#include "PINT-reqproto-encode.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -50,7 +51,7 @@ machine pvfs2_client_statfs_sm
*/
PVFS_error PVFS_isys_statfs(
PVFS_fs_id fs_id,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sysresp_statfs *resp,
PVFS_sys_op_id *op_id,
void *user_ptr)
@@ -114,7 +115,7 @@ PVFS_error PVFS_isys_statfs(
}
PINT_init_msgarray_params(sm_p, fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.statfs_list.fs_id = fs_id;
sm_p->u.statfs_list.details = NULL;
sm_p->u.statfs_list.resp = resp;
@@ -137,7 +138,7 @@ PVFS_error PVFS_isys_statfs(
*/
PVFS_error PVFS_sys_statfs(
PVFS_fs_id fs_id,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sysresp_statfs* resp)
{
PVFS_error ret = -PVFS_EINVAL, error = 0;
@@ -146,7 +147,7 @@ PVFS_error PVFS_sys_statfs(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_statfs entered\n");
ret = PVFS_isys_statfs(
- fs_id, credentials, resp, &op_id, NULL);
+ fs_id, credential, resp, &op_id, NULL);
if (ret)
{
Index: sys-symlink.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-symlink.sm,v
diff -p -u -r1.71.2.2 -r1.71.2.3
--- sys-symlink.sm 22 May 2008 18:24:02 -0000 1.71.2.2
+++ sys-symlink.sm 21 Jul 2008 22:02:48 -0000 1.71.2.3
@@ -23,6 +23,7 @@
#include "pint-util.h"
#include "ncache.h"
#include "pvfs2-internal.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -147,7 +148,7 @@ PVFS_error PVFS_isys_symlink(
PVFS_object_ref parent_ref,
char *target,
PVFS_sys_attr attr,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sysresp_symlink *resp,
PVFS_sys_op_id *op_id,
void *user_ptr)
@@ -192,7 +193,7 @@ PVFS_error PVFS_isys_symlink(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, parent_ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.sym.link_name = entry_name;
sm_p->u.sym.link_target = target;
sm_p->u.sym.sym_resp = resp;
@@ -217,7 +218,7 @@ PVFS_error PVFS_sys_symlink(
PVFS_object_ref parent_ref,
char *target,
PVFS_sys_attr attr,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sysresp_symlink *resp)
{
PVFS_error ret = -PVFS_EINVAL, error = 0;
@@ -226,7 +227,7 @@ PVFS_error PVFS_sys_symlink(
gossip_debug(GOSSIP_CLIENT_DEBUG, "PVFS_sys_symlink entered\n");
ret = PVFS_isys_symlink(entry_name, parent_ref, target, attr,
- credentials, resp, &op_id, NULL);
+ credential, resp, &op_id, NULL);
if (ret)
{
PVFS_perror_gossip("PVFS_isys_symlink call", ret);
@@ -352,6 +353,9 @@ static PINT_sm_action symlink_dspace_cre
int ret = -PVFS_EINVAL;
PVFS_handle_extent_array meta_handle_extent_array;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
js_p->error_code = 0;
@@ -373,7 +377,8 @@ static PINT_sm_action symlink_dspace_cre
PINT_SERVREQ_CREATE_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
+ *sm_p->newcred_p,
sm_p->object_ref.fs_id,
PVFS_TYPE_SYMLINK,
meta_handle_extent_array);
@@ -402,6 +407,9 @@ static PINT_sm_action symlink_crdirent_s
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
js_p->error_code = 0;
@@ -412,7 +420,7 @@ static PINT_sm_action symlink_crdirent_s
PINT_SERVREQ_CRDIRENT_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->u.sym.link_name,
sm_p->u.sym.symlink_handle,
sm_p->object_ref.handle,
@@ -453,6 +461,9 @@ static PINT_sm_action symlink_setattr_se
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
js_p->error_code = 0;
@@ -466,7 +477,7 @@ static PINT_sm_action symlink_setattr_se
PINT_SERVREQ_SETATTR_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->u.sym.symlink_handle,
PVFS_TYPE_SYMLINK,
@@ -514,6 +525,9 @@ static PINT_sm_action symlink_delete_han
struct PINT_client_sm *sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
int ret = -PVFS_EINVAL;
PINT_sm_msgpair_state *msg_p = NULL;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
js_p->error_code = 0;
@@ -522,7 +536,7 @@ static PINT_sm_action symlink_delete_han
PINT_SERVREQ_REMOVE_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
sm_p->u.sym.symlink_handle);
Index: sys-truncate.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-truncate.sm,v
diff -p -u -r1.56.8.1 -r1.56.8.2
--- sys-truncate.sm 16 May 2008 15:15:32 -0000 1.56.8.1
+++ sys-truncate.sm 21 Jul 2008 22:02:48 -0000 1.56.8.2
@@ -24,6 +24,7 @@
#include "PINT-reqproto-encode.h"
#include "acache.h"
#include "pvfs2-internal.h"
+#include "security-types.h"
extern job_context_id pint_client_sm_context;
@@ -72,7 +73,7 @@ machine pvfs2_client_truncate_sm
PVFS_error PVFS_isys_truncate(
PVFS_object_ref ref,
PVFS_size size,
- const PVFS_credentials *credentials,
+ const PVFS_credential *credential,
PVFS_sys_op_id *op_id,
void *user_ptr)
{
@@ -108,7 +109,7 @@ PVFS_error PVFS_isys_truncate(
sm_p = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
PINT_init_msgarray_params(sm_p, ref.fs_id);
- PINT_init_sysint_credentials(sm_p->cred_p, credentials);
+ PINT_init_sysint_credential(sm_p->newcred_p, credential);
sm_p->u.truncate.size = size;
sm_p->object_ref = ref;
@@ -126,7 +127,7 @@ PVFS_error PVFS_isys_truncate(
PVFS_error PVFS_sys_truncate(
PVFS_object_ref ref,
PVFS_size size,
- const PVFS_credentials *credentials)
+ const PVFS_credential *credential)
{
PVFS_error ret = -PVFS_EINVAL, error = 0;
PVFS_sys_op_id op_id;
@@ -134,7 +135,7 @@ PVFS_error PVFS_sys_truncate(
gossip_debug(GOSSIP_CLIENT_DEBUG,
"PVFS_sys_truncate entered with %lld\n", lld(size));
- ret = PVFS_isys_truncate(ref, size, credentials, &op_id, NULL);
+ ret = PVFS_isys_truncate(ref, size, credential, &op_id, NULL);
if (ret)
{
PVFS_perror_gossip("PVFS_isys_truncate call", ret);
@@ -165,6 +166,9 @@ static PINT_sm_action truncate_datafile_
PINT_sm_msgpair_state *msg_p = NULL;
PVFS_size new_dfile_size = 0;
PINT_request_file_data file_data;
+ PVFS_capability xxremovemexx;
+
+ memset(&xxremovemexx, 0, sizeof(PVFS_capability));
js_p->error_code = 0;
@@ -214,7 +218,7 @@ static PINT_sm_action truncate_datafile_
PINT_SERVREQ_TRUNCATE_FILL(
msg_p->req,
- *sm_p->cred_p,
+ xxremovemexx,
sm_p->object_ref.fs_id,
new_dfile_size,
attr->u.meta.dfile_array[i]);
More information about the Pvfs2-cvs
mailing list