]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: send an error response if reading an ACL off disk fails
authorGreg Farnum <gregf@hq.newdream.net>
Wed, 31 Mar 2010 23:06:45 +0000 (16:06 -0700)
committerGreg Farnum <gregf@hq.newdream.net>
Fri, 2 Apr 2010 23:51:19 +0000 (16:51 -0700)
src/rgw/rgw_op.cc
src/rgw/rgw_rest.cc

index 2e2ca6cb28f250212feefd6c040c2d5fea8d2af1..c18de46c04a3681eedd63dc01759f712a542e9a3 100644 (file)
@@ -486,10 +486,11 @@ void RGWGetACLs::execute()
     return;
   }
 
-  int ret = read_acls(s);
+  ret = read_acls(s);
 
   if (ret < 0) {
-    /* FIXME */
+    send_response();
+    return;
   }
 
   stringstream ss;
index 8063250b0abe30d2151f82f47174c053dd71f578..3a609e4dfeaa94e24b81f94afe74cbecd600e926 100644 (file)
@@ -368,6 +368,7 @@ void RGWCopyObj_REST::send_response()
 
 void RGWGetACLs_REST::send_response()
 {
+  if (ret) dump_errno(s, ret);
   end_header(s, "application/xml");
   dump_start_xml(s);
   FCGX_PutStr(acls.c_str(), acls.size(), s->fcgx->out);