Index: /branches/cu-security-branch/src/client/sysint/sys-getattr.sm
===================================================================
--- /branches/cu-security-branch/src/client/sysint/sys-getattr.sm	(revision 8423)
+++ /branches/cu-security-branch/src/client/sysint/sys-getattr.sm	(revision 8444)
@@ -381,16 +381,11 @@
     if (sm_p->getattr.req_attrmask & PVFS_ATTR_CAPABILITY)
     {
-        if (sm_p->getattr.attr.capability.timeout == 0)
-        {
-            trimmed_mask |= PVFS_ATTR_CAPABILITY;
-            gossip_debug(GOSSIP_ACACHE_DEBUG, "Cache capability invalid...\n");
-        }
-        if(PINT_util_get_current_time() >
-            (sm_p->getattr.attr.capability.timeout - CAP_TIMEOUT_BUFFER))
-        {
-            trimmed_mask |= PVFS_ATTR_CAPABILITY;
-            gossip_debug(GOSSIP_ACACHE_DEBUG, "Cache capability timeout...\n");
-        }
-    }
+        /* add back the capability flag */
+        trimmed_mask |= PVFS_ATTR_CAPABILITY;
+    }
+
+    /* nlmills: TODO: don't accept the capability if it is about to
+     * time out. make use of CAP_TIMEOUT_BUFFER.
+     */
   
     /* trimmed_mask contains the list of attributes
@@ -410,4 +405,6 @@
                      trimmed_mask);
     if((missing_attrs == PVFS_ATTR_DATA_SIZE && size_status == 0) ||
+        /* nlmills: TODO: dirty hack: XXX: remove me */
+        (missing_attrs == PVFS_ATTR_META_MIRROR_DFILES) ||
         (missing_attrs == 0))
     {