[Pvfs2-cvs] commit by nlmills in pvfs2/src/client/sysint: client-state-machine.h sys-readdir.sm

[CVS commit program]

Update of /anoncvs/pvfs2/src/client/sysint
In directory parlweb1:/tmp/cvs-serv22321/src/client/sysint

Modified Files:
      Tag: cu-security-branch
	client-state-machine.h sys-readdir.sm 
Log Message:
readdir now uses a real capability


Index: client-state-machine.h
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/client-state-machine.h,v
diff -p -u -r1.173.4.3 -r1.173.4.4
--- client-state-machine.h	21 Jul 2008 22:02:47 -0000	1.173.4.3
+++ client-state-machine.h	24 Jul 2008 21:22:33 -0000	1.173.4.4
@@ -19,6 +19,7 @@
 #include "pvfs2-types.h"
 #include "pvfs2-storage.h"
 #include "pvfs2-util.h"
+#include "pint-util.h"
 #include "PINT-reqproto-encode.h"
 #include "job.h"
 #include "trove.h"

Index: sys-readdir.sm
===================================================================
RCS file: /anoncvs/pvfs2/src/client/sysint/sys-readdir.sm,v
diff -p -u -r1.52.8.2 -r1.52.8.3
--- sys-readdir.sm	21 Jul 2008 22:02:48 -0000	1.52.8.2
+++ sys-readdir.sm	24 Jul 2008 21:22:34 -0000	1.52.8.3
@@ -208,7 +208,7 @@ static PINT_sm_action readdir_init(
     PINT_SM_GETATTR_STATE_FILL(
         sm_p->getattr,
         sm_p->object_ref,
-        PVFS_ATTR_DIR_ALL,
+        PVFS_ATTR_DIR_ALL|PVFS_ATTR_CAPABILITY,
         PVFS_TYPE_DIRECTORY,
         0);
     
@@ -223,9 +223,6 @@ 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");
@@ -250,7 +247,7 @@ static PINT_sm_action readdir_msg_setup_
 
     PINT_SERVREQ_READDIR_FILL(
         msg_p->req,
-        xxremovemexx,
+        sm_p->getattr.attr.capability,
         sm_p->object_ref.fs_id,
         sm_p->object_ref.handle,
         sm_p->readdir.pos_token,