From: Enming.Zhang <zvampirem77@gmail.com>
Date: Tue, 27 Nov 2018 10:05:32 +0000 (-0500)
Subject: rgw: fix obj can still be deleted even if deleteobject policy is set
X-Git-Tag: v12.2.12~84^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3874b2038288f28f067e32b53701ffd5a1fe5720;p=ceph.git

rgw: fix obj can still be deleted even if deleteobject policy is set

Fixes: http://tracker.ceph.com/issues/37403

Signed-off-by: Enming.Zhang <zvampirem77@gmail.com>
(cherry picked from commit 84879e915eb3f01b453aa2138cd44c09925e7cd1)

Conflicts:
	src/rgw/rgw_op.cc : Resolved in verify_permission
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 730de87fa31e..31925e57db75 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -4240,7 +4240,7 @@ int RGWDeleteObj::verify_permission()
     if (r == Effect::Allow)
       return true;
     else if (r == Effect::Deny)
-      return false;
+      return -EACCES;
   }
 
   if (!verify_bucket_permission_no_policy(s, RGW_PERM_WRITE)) {