Merge branch 'next'

configure.ac

@@ -8,7 +8,7 @@ AC_PREREQ(2.59)
 # VERSION define is not used by the code.  It gets a version string
 # from 'git describe'; see src/ceph_ver.[ch]
 
-AC_INIT([ceph], [0.73], [[email protected]])
+AC_INIT([ceph], [0.74], [[email protected]])
 
 # Create release string.  Used with VERSION for RPMs.
 RPM_RELEASE=0

debian/changelog

@@ -1,3 +1,9 @@
+ceph (0.74-1) stable; urgency=low
+
+  * New upstream release 
+
+ -- Gary Lowell <[email protected]>  Mon, 30 Dec 2013 21:02:35 +0000
+
 ceph (0.73-1) precise; urgency=low
 
   * New upstream release 

src/rgw/rgw_bucket.cc

@@ -722,11 +722,19 @@ int RGWBucket::get_policy(RGWBucketAdminOpState& op_state, ostream& o)
   std::string object_name = op_state.get_object_name();
   rgw_bucket bucket = op_state.get_bucket();
 
-  bufferlist bl;
-  rgw_obj obj(bucket, object_name);
-  int ret = store->get_attr(NULL, obj, RGW_ATTR_ACL, bl);
-  if (ret < 0)
+  RGWBucketInfo bucket_info;
+  map<string, bufferlist> attrs;
+  int ret = store->get_bucket_info(NULL, bucket.name, bucket_info, NULL, &attrs);
+  if (ret < 0) {
     return ret;
+  }
+
+  map<string, bufferlist>::iterator aiter = attrs.find(RGW_ATTR_ACL);
+  if (aiter == attrs.end()) {
+    return -ENOENT;
+  }
+
+  bufferlist& bl = aiter->second;
 
   RGWAccessControlPolicy_S3 policy(g_ceph_context);
   bufferlist::iterator iter = bl.begin();