Index: /branches/cu-security-branch/include/pvfs2-encode-stubs.h
===================================================================
--- /branches/cu-security-branch/include/pvfs2-encode-stubs.h	(revision 8397)
+++ /branches/cu-security-branch/include/pvfs2-encode-stubs.h	(revision 8398)
@@ -54,4 +54,5 @@
 #define endecode_fields_5_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5) struct endecode_fake_struct
 #define endecode_fields_6(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6) struct endecode_fake_struct
+#define endecode_fields_6_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6) struct endecode_fake_struct
 #define endecode_fields_7_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6,t7,x7) struct endecode_fake_struct
 #define endecode_fields_8_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,t6,x6,t7,x7,t8,x8) struct endecode_fake_struct
@@ -71,4 +72,5 @@
 #define endecode_fields_4a_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,tn1,n1,ta1,a1) struct endecode_fake_struct
 #define endecode_fields_5a_struct(n,t1,x1,t2,x2,t3,x3,t4,x4,t5,x5,tn1,n1,ta1,a1) struct endecode_fake_struct
+#define endecode_fields_3a2a_struct(n,t1,x1,t2,x2,t3,x3,tn1,n1,ta1,a1,t4,x4,t5,x5,tn2,n2,ta2,a2) struct endecode_fake_struct
 
 #define encode_enum_union_2_struct(name, ename, uname, ut1, un1, en1, ut2, un2, en2) struct endecode_fake_struct
Index: /branches/cu-security-branch/include/pvfs2-types.h
===================================================================
--- /branches/cu-security-branch/include/pvfs2-types.h	(revision 8397)
+++ /branches/cu-security-branch/include/pvfs2-types.h	(revision 8398)
@@ -925,5 +925,5 @@
     uint32_t, op_mask,
     uint32_t, num_handles,
-    PVFS_handle, handle_array)
+    PVFS_handle, handle_array);
 #define extra_size_PVFS_capability (PVFS_REQ_LIMIT_HANDLES_COUNT * \
                                     sizeof(PVFS_handle)          + \
@@ -952,5 +952,5 @@
     PVFS_time, timeout,
     uint32_t, sig_size,
-    PVFS_signature, signature)
+    PVFS_signature, signature);
 #define extra_size_PVFS_credential (PVFS_REQ_LIMIT_GROUPS    * \
                                     sizeof(PVFS_gid)         + \
Index: /branches/cu-security-branch/src/proto/pvfs2-req-proto.h
===================================================================
--- /branches/cu-security-branch/src/proto/pvfs2-req-proto.h	(revision 8397)
+++ /branches/cu-security-branch/src/proto/pvfs2-req-proto.h	(revision 8398)
@@ -336,5 +336,5 @@
     PVFS_fs_id, fs_id,
     int32_t, handle_count,
-    PVFS_handle, handles)
+    PVFS_handle, handles);
 #define extra_size_PVFS_servreq_batch_remove \
   (PVFS_REQ_LIMIT_HANDLES_COUNT * sizeof(PVFS_handle))
@@ -604,5 +604,5 @@
 endecode_fields_1_struct(
     PVFS_servresp_getattr,
-    PVFS_object_attr, attr)
+    PVFS_object_attr, attr);
 #define extra_size_PVFS_servresp_getattr \
     extra_size_PVFS_object_attr
@@ -1140,5 +1140,5 @@
     skip4,,
     PVFS_size, size,
-    int32_t, flags)
+    int32_t, flags);
 #define PINT_SERVREQ_TRUNCATE_FILL(__req,  \
                                 __cap,     \
@@ -1166,5 +1166,5 @@
 endecode_fields_1_struct(
     PVFS_servreq_statfs,
-    PVFS_fs_id, fs_id)
+    PVFS_fs_id, fs_id);
 
 #define PINT_SERVREQ_STATFS_FILL(__req, __cap, __fsid, __hints)\
@@ -1470,5 +1470,5 @@
     skip4,,
     uint32_t, nhandles,
-    PVFS_handle, handles)
+    PVFS_handle, handles);
 #define extra_size_PVFS_servreq_listattr \
     (PVFS_REQ_LIMIT_LISTATTR * sizeof(PVFS_handle))
Index: /branches/cu-security-branch/src/proto/PINT-le-bytefield.c
===================================================================
--- /branches/cu-security-branch/src/proto/PINT-le-bytefield.c	(revision 8397)
+++ /branches/cu-security-branch/src/proto/PINT-le-bytefield.c	(revision 8398)
@@ -955,5 +955,4 @@
             case PVFS_SERV_LISTEATTR:
             case PVFS_SERV_BATCH_REMOVE:
-            case PVFS_SERV_UNSTUFF:
             case PVFS_SERV_IMM_COPIES:
               /*nothing to free*/