[Pvfs2-cvs] commit by nlmills in pvfs2/src/common/misc: pint-util.c

[CVS commit program]

Update of /anoncvs/pvfs2/src/common/misc
In directory parlweb1:/tmp/cvs-serv27004/src/common/misc

Modified Files:
      Tag: cu-security-branch
	pint-util.c 
Log Message:
cleaned up routines that copy capabilities


Index: pint-util.c
===================================================================
RCS file: /anoncvs/pvfs2/src/common/misc/pint-util.c,v
diff -p -u -r1.26.2.1 -r1.26.2.2
--- pint-util.c	16 May 2008 15:15:35 -0000	1.26.2.1
+++ pint-util.c	14 Jul 2008 20:09:22 -0000	1.26.2.2
@@ -19,6 +19,7 @@
 #include "gen-locks.h"
 #include "pint-util.h"
 #include "gossip.h"
+#include "security-util.h"
 
 void PINT_time_mark(PINT_time_marker *out_marker)
 {
@@ -231,6 +232,15 @@ int PINT_copy_object_attr(PVFS_object_at
             }
         }
 
+        if (src->mask & PVFS_ATTR_CAPABILITY)
+        {
+            ret = PINT_copy_capability(&src->capability, &dest->capability);
+            if (ret < 0)
+            {
+                return ret;
+            }
+        }
+
 	dest->mask = src->mask;
         ret = 0;
     }
@@ -241,6 +251,14 @@ void PINT_free_object_attr(PVFS_object_a
 {
     if (attr)
     {
+        if (attr->mask & PVFS_ATTR_CAPABILITY)
+        {
+            free(attr->capability.signature);
+            attr->capability.signature = NULL;
+            free(attr->capability.handle_array);
+            attr->capability.handle_array = NULL;
+        }
+
         if (attr->objtype == PVFS_TYPE_METAFILE)
         {
             if (attr->mask & PVFS_ATTR_META_DFILES)