From 9e46058a7b150364a3467b09dad1b3c296524a99 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Fri, 4 Oct 2013 13:00:26 -0700 Subject: rgw: swift update obj metadata also add generic attrs Fixes: #6462 We were missing the generic attributes when we updated the object metadata (operation that only exists in the swift api). Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_op.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 114b8709a22..fc4ad6d3511 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -1604,6 +1604,13 @@ void RGWPutMetadata::execute() } } + map::iterator giter; + for (giter = s->generic_attrs.begin(); giter != s->generic_attrs.end(); ++giter) { + bufferlist& attrbl = attrs[giter->first]; + const string& val = giter->second; + attrbl.append(val.c_str(), val.size() + 1); + } + if (has_policy) { policy.encode(bl); attrs[RGW_ATTR_ACL] = bl; -- cgit v1.2.1